Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a675aea2 by tchemit at 2019-02-03T12:09:31Z Bug observe connexion via webservice - Closes #1206 - - - - - d98cdc09 by tchemit at 2019-02-03T14:24:23Z [UI] Listes déroulantes : ergonomie - Closes #1202 - - - - - 273d1d32 by tchemit at 2019-02-03T14:46:57Z [LL - Observation Capture] L'onglet Brancheline est accessible même si aucune donnée n'est sélectionée - Closes #1210 - - - - - 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: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/help/ShowAboutAction.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.client.ui.actions.main.menu.help; * #L% */ -import com.vladsch.flexmark.ast.Node; import com.vladsch.flexmark.html.HtmlRenderer; import com.vladsch.flexmark.parser.Parser; +import com.vladsch.flexmark.util.ast.Node; import fr.ird.observe.client.ObserveRunner; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveTextGenerator; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== @@ -343,7 +343,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> String propertyName = editor.getName(); JLabel label = (JLabel) ui.getObjectById(propertyName + "Label"); Objects.requireNonNull(label, "can't find label for temperatur editor " + editor); - editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, getBean(), label.getText(), propertyName)); + editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, label.getText(), propertyName)); + editor.setBean(getBean()); editor.init(label); editor.getModel().addPropertyChangeListener("format", e -> { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx ===================================== @@ -401,17 +401,16 @@ <cell anchor='east'> <JCheckBox id='timer'/> </cell> - <cell> - <JLabel id='timeSinceContactLabel'/> - </cell> - <cell> + <cell columns="2"> <TimeEditor id='timeSinceContact' constructorParams='this'/> </cell> </row> <!-- timerTimeOnBoard --> <row> - <cell columns="3"> + <cell> + </cell> + <cell columns="2"> <DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss ===================================== @@ -20,6 +20,10 @@ * #L% */ +JCheckBox { + i18nProperty:""; +} + #model { valid:{validator.isValid() && validatorTable.isValid() && getSizeMeasuresTableModel().isValid() && getWeightMeasuresTableModel().isValid()}; canSaveRow:{validatorTable.isChanged() && validatorTable.isValid() && getSizeMeasuresTableModel().isValid() && getWeightMeasuresTableModel().isValid()}; @@ -279,7 +283,7 @@ /* BRANCHLINE TAB ************************************************************* */ /* ***************************************************************************** */ -#branchlineFormTab { +#branchlineTab { icon:{handler.getErrorIconIfFalse(model.isBranchlineTabValid())}; enabled:{!tableModel.isCreate() && tableEditBean.getBranchline() != null}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx ===================================== @@ -95,7 +95,7 @@ <cell anchor='east' weightx="1" fill="both"> <EnumEditor id='typeOperation' genericType='TypeTransmittingBuoyOperation' constructorParams='TypeTransmittingBuoyOperation.class' - onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedItem(), true); model.setModified(true); }'/> + onItemStateChanged='if(event.getStateChange()==ItemEvent.SELECTED && model.isEditing()) { getHandler().changeTypeOperation(typeOperation.getSelectedValue(), true); model.setModified(true); }'/> </cell> </row> </Table> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java ===================================== @@ -42,8 +42,8 @@ import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationReference; import fr.ird.observe.dto.result.SaveResultDto; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.validator.NuitonValidatorScope; @@ -141,7 +141,7 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH FloatingObjectTransmittingBuoyOperationUI.BINDING_TYPE_OPERATION_SELECTED_ITEM); TypeTransmittingBuoyOperation typeOperation = - getUi().getTypeOperation().getSelectedItem(); + getUi().getTypeOperation().getSelectedValue(); changeTypeOperation(typeOperation, false); getModel().setMode(mode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== @@ -308,25 +308,25 @@ public class NavigationTree extends JXTree { selectedNode = getTripNode(context.getSelectedProgramId(), context.getSelectedTripId()); - if (context.isSelectedRoute()) { + if (selectedNode!=null && context.isSelectedRoute()) { selectedNode = getRouteNode(selectedNode, context.getSelectedRouteId()); - if (context.isSelectedActivitySeine()) { + if (selectedNode != null && context.isSelectedActivitySeine()) { selectedNode = getActivitySeineNode(selectedNode, context.getSelectedActivityId()); - if (context.isSelectedSetSeine()) { + if (selectedNode != null && context.isSelectedSetSeine()) { selectedNode = getSetSeineNode(selectedNode); - } else if (context.isSelectedFloatingObject()) { + } else if (selectedNode != null && context.isSelectedFloatingObject()) { selectedNode = getFloatingObjectNode(selectedNode, context.getSelectedFloatingObjectId()); } } } - if (context.isSelectedActivityLongline()) { + if (selectedNode != null && context.isSelectedActivityLongline()) { selectedNode = getActivityLonglineNode(selectedNode, context.getSelectedActivityId()); - if (context.isSelectedSetLongline()) { + if (selectedNode != null && context.isSelectedSetLongline()) { selectedNode = getSetLonglineNode(selectedNode); } @@ -343,24 +343,24 @@ public class NavigationTree extends JXTree { selectedNode = getTripNode(context.getOpenProgramId(), context.getOpenTripId()); - if (context.isOpenRoute()) { + if (selectedNode != null && context.isOpenRoute()) { selectedNode = getRouteNode(selectedNode, context.getOpenRouteId()); - if (context.isOpenActivity()) { + if (selectedNode != null && context.isOpenActivity()) { selectedNode = getActivitySeineNode(selectedNode, context.getOpenActivityId()); - if (context.isOpenSet()) { + if (selectedNode != null && context.isOpenSet()) { selectedNode = getSetSeineNode(selectedNode); } } } - if (context.isOpenActivityLongline()) { + if (selectedNode != null && context.isOpenActivityLongline()) { selectedNode = getActivityLonglineNode(selectedNode, context.getOpenActivityId()); - if (context.isOpenSet()) { + if (selectedNode != null && context.isOpenSet()) { selectedNode = getSetLonglineNode(selectedNode); } ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.10</version> + <version>2019.8.4</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,6 +163,7 @@ <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>--> <!--can't use 1.4.197 (date has changed + blob also--> <lib.version.h2>1.4.196</lib.version.h2> + <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> <lib.version.java4all.topia>1.1.11</lib.version.java4all.topia> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/31fe85c9111db4abe53e438842d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/31fe85c9111db4abe53e438842d... You're receiving this email because of your account on gitlab.com.