Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe
Commits:
-
85d5435a
by Tony Chemit at 2024-01-22T12:24:16+01:00
-
039baf2c
by Tony Chemit at 2024-01-22T12:24:16+01:00
4 changed files:
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx
- client/datasource/editor/spi/pom.xml
- pom.xml
Changes:
| ... | ... | @@ -67,6 +67,7 @@ |
| 67 | 67 | <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership1"/>
|
| 68 | 68 | <field name="code" component="code1"/>
|
| 69 | 69 | <field name="country" component="country1"/>
|
| 70 | + <field name="vessel" component="vessel1"/>
|
|
| 70 | 71 | <field name='longitude' component='coordinate1'/>
|
| 71 | 72 | <field name='latitude' component='coordinate1'/>
|
| 72 | 73 | <field name='quadrant' component='coordinate1'/>
|
| ... | ... | @@ -80,6 +81,7 @@ |
| 80 | 81 | <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership2"/>
|
| 81 | 82 | <field name="code" component="code2"/>
|
| 82 | 83 | <field name="country" component="country2"/>
|
| 84 | + <field name="vessel" component="vessel2"/>
|
|
| 83 | 85 | <field name='comment' component='comment2'/>
|
| 84 | 86 | </BeanValidator>
|
| 85 | 87 |
| ... | ... | @@ -68,6 +68,7 @@ |
| 68 | 68 | <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership1"/>
|
| 69 | 69 | <field name="code" component="code1"/>
|
| 70 | 70 | <field name="country" component="country1"/>
|
| 71 | + <field name="vessel" component="vessel1"/>
|
|
| 71 | 72 | <field name='longitude' component='coordinate1'/>
|
| 72 | 73 | <field name='latitude' component='coordinate1'/>
|
| 73 | 74 | <field name='quadrant' component='coordinate1'/>
|
| ... | ... | @@ -81,6 +82,7 @@ |
| 81 | 82 | <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership2"/>
|
| 82 | 83 | <field name="code" component="code2"/>
|
| 83 | 84 | <field name="country" component="country2"/>
|
| 85 | + <field name="vessel" component="vessel2"/>
|
|
| 84 | 86 | <field name='comment' component='comment2'/>
|
| 85 | 87 | </BeanValidator>
|
| 86 | 88 | |
| ... | ... | @@ -229,7 +231,7 @@ |
| 229 | 231 | <JLabel id='vessel1Label'/>
|
| 230 | 232 | </cell>
|
| 231 | 233 | <cell anchor='east' weightx="1" fill="both">
|
| 232 | - <FilterableComboBox id='vessel1' genericType='VesselReference'/>
|
|
| 234 | + <FilterableComboBox id='vessel1' genericType='VesselReference' beanScope="transmittingBuoy1"/>
|
|
| 233 | 235 | </cell>
|
| 234 | 236 | </row>
|
| 235 | 237 | <row>
|
| ... | ... | @@ -154,6 +154,18 @@ |
| 154 | 154 | <scope>test</scope>
|
| 155 | 155 | </dependency>
|
| 156 | 156 | </dependencies>
|
| 157 | + <build>
|
|
| 158 | + <pluginManagement>
|
|
| 159 | + <plugins>
|
|
| 160 | + <plugin>
|
|
| 161 | + <artifactId>maven-plugin-plugin</artifactId>
|
|
| 162 | + <configuration>
|
|
| 163 | + <goalPrefix>client-datasource-editor-spi</goalPrefix>
|
|
| 164 | + </configuration>
|
|
| 165 | + </plugin>
|
|
| 166 | + </plugins>
|
|
| 167 | + </pluginManagement>
|
|
| 168 | + </build>
|
|
| 157 | 169 | <profiles>
|
| 158 | 170 | <profile>
|
| 159 | 171 | <id>reporting</id>
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <parent>
|
| 24 | 24 | <groupId>io.ultreia.maven</groupId>
|
| 25 | 25 | <artifactId>pom</artifactId>
|
| 26 | - <version>2023.47</version>
|
|
| 26 | + <version>2024.02</version>
|
|
| 27 | 27 | </parent>
|
| 28 | 28 | <groupId>fr.ird.observe</groupId>
|
| 29 | 29 | <artifactId>ird-observe</artifactId>
|
| ... | ... | @@ -129,6 +129,7 @@ |
| 129 | 129 | <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>-->
|
| 130 | 130 | <lib.version.hsqldb>2.7.0</lib.version.hsqldb>
|
| 131 | 131 | <!-- FIXME <lib.version.hsqldb>2.7.1</lib.version.hsqldb>-->
|
| 132 | + <lib.version.java4all.http>1.0.47</lib.version.java4all.http>
|
|
| 132 | 133 | <!-- license header configuration -->
|
| 133 | 134 | <license.licenseName>gpl_v3</license.licenseName>
|
| 134 | 135 | <license.organizationName>IRD, Ultreia.io</license.organizationName>
|