Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
a675aea2
by tchemit at 2019-02-03T12:09:31Z
-
d98cdc09
by tchemit at 2019-02-03T14:24:23Z
-
273d1d32
by tchemit at 2019-02-03T14:46:57Z
8 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/help/ShowAboutAction.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java
- pom.xml
Changes:
| ... | ... | @@ -22,9 +22,9 @@ package fr.ird.observe.client.ui.actions.main.menu.help; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
-import com.vladsch.flexmark.ast.Node;
|
|
| 26 | 25 |
import com.vladsch.flexmark.html.HtmlRenderer;
|
| 27 | 26 |
import com.vladsch.flexmark.parser.Parser;
|
| 27 |
+import com.vladsch.flexmark.util.ast.Node;
|
|
| 28 | 28 |
import fr.ird.observe.client.ObserveRunner;
|
| 29 | 29 |
import fr.ird.observe.client.ObserveSwingApplicationContext;
|
| 30 | 30 |
import fr.ird.observe.client.ObserveTextGenerator;
|
| ... | ... | @@ -343,7 +343,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> |
| 343 | 343 |
String propertyName = editor.getName();
|
| 344 | 344 |
JLabel label = (JLabel) ui.getObjectById(propertyName + "Label");
|
| 345 | 345 |
Objects.requireNonNull(label, "can't find label for temperatur editor " + editor);
|
| 346 |
- editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, getBean(), label.getText(), propertyName));
|
|
| 346 |
+ editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, label.getText(), propertyName));
|
|
| 347 |
+ editor.setBean(getBean());
|
|
| 347 | 348 |
editor.init(label);
|
| 348 | 349 |
|
| 349 | 350 |
editor.getModel().addPropertyChangeListener("format", e -> {
|
| ... | ... | @@ -401,17 +401,16 @@ |
| 401 | 401 |
<cell anchor='east'>
|
| 402 | 402 |
<JCheckBox id='timer'/>
|
| 403 | 403 |
</cell>
|
| 404 |
- <cell>
|
|
| 405 |
- <JLabel id='timeSinceContactLabel'/>
|
|
| 406 |
- </cell>
|
|
| 407 |
- <cell>
|
|
| 404 |
+ <cell columns="2">
|
|
| 408 | 405 |
<TimeEditor id='timeSinceContact' constructorParams='this'/>
|
| 409 | 406 |
</cell>
|
| 410 | 407 |
</row>
|
| 411 | 408 |
|
| 412 | 409 |
<!-- timerTimeOnBoard -->
|
| 413 | 410 |
<row>
|
| 414 |
- <cell columns="3">
|
|
| 411 |
+ <cell>
|
|
| 412 |
+ </cell>
|
|
| 413 |
+ <cell columns="2">
|
|
| 415 | 414 |
<DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/>
|
| 416 | 415 |
</cell>
|
| 417 | 416 |
</row>
|
| ... | ... | @@ -20,6 +20,10 @@ |
| 20 | 20 |
* #L%
|
| 21 | 21 |
*/
|
| 22 | 22 |
|
| 23 |
+JCheckBox {
|
|
| 24 |
+ i18nProperty:"";
|
|
| 25 |
+}
|
|
| 26 |
+ |
|
| 23 | 27 |
#model {
|
| 24 | 28 |
valid:{validator.isValid() && validatorTable.isValid() && getSizeMeasuresTableModel().isValid() && getWeightMeasuresTableModel().isValid()};
|
| 25 | 29 |
canSaveRow:{validatorTable.isChanged() && validatorTable.isValid() && getSizeMeasuresTableModel().isValid() && getWeightMeasuresTableModel().isValid()};
|
| ... | ... | @@ -279,7 +283,7 @@ |
| 279 | 283 |
/* BRANCHLINE TAB ************************************************************* */
|
| 280 | 284 |
/* ***************************************************************************** */
|
| 281 | 285 |
|
| 282 |
-#branchlineFormTab {
|
|
| 286 |
+#branchlineTab {
|
|
| 283 | 287 |
icon:{handler.getErrorIconIfFalse(model.isBranchlineTabValid())};
|
| 284 | 288 |
enabled:{!tableModel.isCreate() && tableEditBean.getBranchline() != null};
|
| 285 | 289 |
}
|
| ... | ... | @@ -95,7 +95,7 @@ |
| 95 | 95 |
<cell anchor='east' weightx="1" fill="both">
|
| 96 | 96 |
<EnumEditor id='typeOperation' genericType='TypeTransmittingBuoyOperation'
|
| 97 | 97 |
constructorParams='TypeTransmittingBuoyOperation.class'
|
| 98 |
- onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedItem(), true); model.setModified(true); }'/>
|
|
| 98 |
+ onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedValue(), true); model.setModified(true); }'/>
|
|
| 99 | 99 |
</cell>
|
| 100 | 100 |
</row>
|
| 101 | 101 |
</Table>
|
| ... | ... | @@ -42,8 +42,8 @@ import fr.ird.observe.dto.form.Form; |
| 42 | 42 |
import fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationDto;
|
| 43 | 43 |
import fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationReference;
|
| 44 | 44 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 45 |
-import org.apache.logging.log4j.Logger;
|
|
| 46 | 45 |
import org.apache.logging.log4j.LogManager;
|
| 46 |
+import org.apache.logging.log4j.Logger;
|
|
| 47 | 47 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 48 | 48 |
import org.nuiton.validator.NuitonValidatorScope;
|
| 49 | 49 |
|
| ... | ... | @@ -141,7 +141,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH |
| 141 | 141 |
FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM);
|
| 142 | 142 |
|
| 143 | 143 |
TypeTransmittingBuoyOperation typeOperation =
|
| 144 |
- getUi().getTypeOperation().getSelectedItem();
|
|
| 144 |
+ getUi().getTypeOperation().getSelectedValue();
|
|
| 145 | 145 |
changeTypeOperation(typeOperation, false);
|
| 146 | 146 |
|
| 147 | 147 |
getModel().setMode(mode);
|
| ... | ... | @@ -308,25 +308,25 @@ public class NavigationTree extends JXTree { |
| 308 | 308 |
|
| 309 | 309 |
selectedNode = getTripNode(context.getSelectedProgramId(), context.getSelectedTripId());
|
| 310 | 310 |
|
| 311 |
- if (context.isSelectedRoute()) {
|
|
| 311 |
+ if (selectedNode!=null && context.isSelectedRoute()) {
|
|
| 312 | 312 |
|
| 313 | 313 |
selectedNode = getRouteNode(selectedNode, context.getSelectedRouteId());
|
| 314 |
- if (context.isSelectedActivitySeine()) {
|
|
| 314 |
+ if (selectedNode != null && context.isSelectedActivitySeine()) {
|
|
| 315 | 315 |
|
| 316 | 316 |
selectedNode = getActivitySeineNode(selectedNode, context.getSelectedActivityId());
|
| 317 |
- if (context.isSelectedSetSeine()) {
|
|
| 317 |
+ if (selectedNode != null && context.isSelectedSetSeine()) {
|
|
| 318 | 318 |
selectedNode = getSetSeineNode(selectedNode);
|
| 319 | 319 |
|
| 320 |
- } else if (context.isSelectedFloatingObject()) {
|
|
| 320 |
+ } else if (selectedNode != null && context.isSelectedFloatingObject()) {
|
|
| 321 | 321 |
selectedNode = getFloatingObjectNode(selectedNode, context.getSelectedFloatingObjectId());
|
| 322 | 322 |
}
|
| 323 | 323 |
}
|
| 324 | 324 |
}
|
| 325 | 325 |
|
| 326 |
- if (context.isSelectedActivityLongline()) {
|
|
| 326 |
+ if (selectedNode != null && context.isSelectedActivityLongline()) {
|
|
| 327 | 327 |
|
| 328 | 328 |
selectedNode = getActivityLonglineNode(selectedNode, context.getSelectedActivityId());
|
| 329 |
- if (context.isSelectedSetLongline()) {
|
|
| 329 |
+ if (selectedNode != null && context.isSelectedSetLongline()) {
|
|
| 330 | 330 |
selectedNode = getSetLonglineNode(selectedNode);
|
| 331 | 331 |
|
| 332 | 332 |
}
|
| ... | ... | @@ -343,24 +343,24 @@ public class NavigationTree extends JXTree { |
| 343 | 343 |
|
| 344 | 344 |
selectedNode = getTripNode(context.getOpenProgramId(), context.getOpenTripId());
|
| 345 | 345 |
|
| 346 |
- if (context.isOpenRoute()) {
|
|
| 346 |
+ if (selectedNode != null && context.isOpenRoute()) {
|
|
| 347 | 347 |
|
| 348 | 348 |
selectedNode = getRouteNode(selectedNode, context.getOpenRouteId());
|
| 349 |
- if (context.isOpenActivity()) {
|
|
| 349 |
+ if (selectedNode != null && context.isOpenActivity()) {
|
|
| 350 | 350 |
|
| 351 | 351 |
selectedNode = getActivitySeineNode(selectedNode, context.getOpenActivityId());
|
| 352 |
- if (context.isOpenSet()) {
|
|
| 352 |
+ if (selectedNode != null && context.isOpenSet()) {
|
|
| 353 | 353 |
selectedNode = getSetSeineNode(selectedNode);
|
| 354 | 354 |
|
| 355 | 355 |
}
|
| 356 | 356 |
}
|
| 357 | 357 |
}
|
| 358 | 358 |
|
| 359 |
- if (context.isOpenActivityLongline()) {
|
|
| 359 |
+ if (selectedNode != null && context.isOpenActivityLongline()) {
|
|
| 360 | 360 |
|
| 361 | 361 |
selectedNode = getActivityLonglineNode(selectedNode, context.getOpenActivityId());
|
| 362 | 362 |
|
| 363 |
- if (context.isOpenSet()) {
|
|
| 363 |
+ if (selectedNode != null && context.isOpenSet()) {
|
|
| 364 | 364 |
selectedNode = getSetLonglineNode(selectedNode);
|
| 365 | 365 |
|
| 366 | 366 |
}
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>io.ultreia.maven</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2018.8.10</version>
|
|
| 29 |
+ <version>2019.8.4</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -163,6 +163,7 @@ |
| 163 | 163 |
<!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
|
| 164 | 164 |
<!--can't use 1.4.197 (date has changed + blob also-->
|
| 165 | 165 |
<lib.version.h2>1.4.196</lib.version.h2>
|
| 166 |
+ <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene>
|
|
| 166 | 167 |
<!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>-->
|
| 167 | 168 |
<!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
|
| 168 | 169 |
<lib.version.java4all.topia>1.1.11</lib.version.java4all.topia>
|