[Git][ultreiaio/ird-observe][develop] 4 commits: use last stable of jaxx

17 Dec 2020


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
1786594d by Tony Chemit at 2020-12-17T23:44:36+01:00
use last stable of jaxx

- - - - -
bf7c28c9 by Tony Chemit at 2020-12-17T23:46:05+01:00
Let's improve once for all select toolbar visibility (always use size of table model, but also can use selected tab for sub content table), and it works pretty well :)

- - - - -
453c24b9 by Tony Chemit at 2020-12-18T00:17:50+01:00
Valider tous les écrans du modèle LL - See #1665

l'écran de composition détaillé commence à fonctionner \o/

- - - - -
8ad27d89 by Tony Chemit at 2020-12-18T00:58:37+01:00
[LL] Ajout données d'observation - Closes #1673

- - - - -


15 changed files:

- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModel.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/CompositionAutoSelectRowAndShowPopupAction.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java
- pom.xml


Changes:

=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java
=====================================
@@ -121,7 +121,8 @@ public class ChangeModeExecutor<U extends ContentUI> {
 
     protected void afterOpenReselectNode(NavigationTree tree, NavigationNode selectedNode, String id) {
         log.info("Will reselect node: " + selectedNode);
-        SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(selectedNode));
+//        SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(selectedNode));
+         tree.reSelectSafeNode(selectedNode);
     }
 
 }


=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java
=====================================
@@ -137,11 +137,17 @@ public abstract class TripActionHelper implements WithClientUIContext {
             NavigationNode tripNode = tree.getSelectedNode().upToReferenceNode(getReferenceType());
             tree.selectSafeNode(tripNode);
             TripUI<?> tripUI = (TripUI<?>) ui.getHandler().getDataSourceEditor().getModel().getContent();
+            if (tripNode.getInitializer().getEditNodeId() == null) {
+                ((ContentUI) tripUI).getMode().doClick();
+                tripUI = (TripUI<?>) ui.getHandler().getDataSourceEditor().getModel().getContent();
+            }
             // set availability flag to true
             tripUI.getModel().set(availabilityPropertyName, true);
             // go to meta-data tab
             TabInfo tabInfo = tabGetter.apply(tripUI);
-            SwingUtilities.invokeLater(() -> tripUI.selectTab(tabInfo));
+            TripUI<?> finalTripUI = tripUI;
+            SwingUtilities.invokeLater(() -> finalTripUI.selectTab(tabInfo));
+
         }
     }
 


=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java
=====================================
@@ -91,6 +91,9 @@ public class TripUIHelper<D extends DataDto, U extends ContentOpenableUI<D, U> &
     }
 
     private void buildTripMap() {
+        if (ui.getModel().getStates().isCreatingMode()) {
+            return;
+        }
         SwingUtilities.invokeLater(() -> {
             getClientUIContext().getBusyModel().addTask("Build map");
             try {


=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java
=====================================
@@ -144,7 +144,8 @@ public abstract class ContentListUIHandler<D extends DataDto, R extends DataDtoR
                 Class<? extends DataDtoReference> referenceType = ui.getModel().getSource().getScope().getMainReferenceType();
                 NavigationNode referenceNode = tree.getSelectedNode().downToReferenceNode(referenceType, id);
                 log.info(String.format("Will reselect node: %s", selectedNode));
-                SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(referenceNode));
+//                SwingUtilities.invokeLater(() -> tree.reSelectSafeNode(referenceNode));
+                tree.reSelectSafeNode(referenceNode);
             }
 
             @Override


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java
=====================================
@@ -57,7 +57,7 @@ class LandingUIHandler extends GeneratedLandingUIHandler {
     @Override
     public void onMainTabChanged(int previousIndex, int selectedIndex) {
         super.onMainTabChanged(previousIndex, selectedIndex);
-        ui.getLandingPartUI().getSelectToolbar().setVisible(selectedIndex == 1);
+        ui.getLandingPartUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getLandingPartUI().getTableModel().getRowCount() > 1);
     }
 
     @Override


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIHandler.java
=====================================
@@ -55,7 +55,7 @@ class SampleUIHandler extends GeneratedSampleUIHandler {
     @Override
     public void onMainTabChanged(int previousIndex, int selectedIndex) {
         super.onMainTabChanged(previousIndex, selectedIndex);
-        ui.getSamplePartUI().getSelectToolbar().setVisible(selectedIndex == 1);
+        ui.getSamplePartUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getSamplePartUI().getTableModel().getRowCount()>1);
     }
 
     @Override


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUIHandler.java
=====================================
@@ -56,6 +56,15 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl
         getContentOpen().initTabUI(ui.getBaitsCompositionUI(), ui.getBaitsCompositionPanel(), 3);
     }
 
+    @Override
+    public void onMainTabChanged(int previousIndex, int selectedIndex) {
+        super.onMainTabChanged(previousIndex, selectedIndex);
+        ui.getFloatlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 0 && ui.getFloatlinesCompositionUI().getTableModel().getRowCount() > 1);
+        ui.getBranchlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getBranchlinesCompositionUI().getTableModel().getRowCount() > 1);
+        ui.getHooksCompositionUI().getSelectToolbar().setVisible(selectedIndex == 2 && ui.getHooksCompositionUI().getTableModel().getRowCount() > 1);
+        ui.getBaitsCompositionUI().getSelectToolbar().setVisible(selectedIndex == 3 && ui.getBaitsCompositionUI().getTableModel().getRowCount() > 1);
+    }
+
     @Override
     protected void installResetAction() {
         ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<SetGlobalCompositionUI>() {


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java
=====================================
@@ -76,7 +76,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
     private final PropertyChangeListener branchlineDetailChanged;
     private final PropertyChangeListener modelCanGenerateChanged;
     private final JVetoableTabbedPane.ChangeSelectedIndex tabbedPaneWillChanged;
-    public SetDetailCompositionUIValidationHelper validationHelper;
 
 
     SetDetailCompositionUIHandler() {
@@ -106,7 +105,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
 
     @Override
     public void onInit(SetDetailCompositionUI ui) {
-        this.validationHelper = new SetDetailCompositionUIValidationHelper(ui);
         super.onInit(ui);
         ui.getSectionTemplatesTable().setCellSelectionEnabled(false);
         ui.get$objectMap().put(DefaultUIInitializer.SUB_TABBED_PANE, ui.getBranchlineDetailUI().getSubTabbedPane());
@@ -118,7 +116,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
 
     @Override
     protected void installResetAction() {
-        ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<SetDetailCompositionUI>() {
+        ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<>() {
             @Override
             public void onUpdate(SetDetailCompositionUI ui) {
                 BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow();
@@ -157,6 +155,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
         Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null);
 
         BranchlineUIModel branchlineUIModel = model.getBranchlineUIModel();
+        branchlineUIModel.setMode(model.getStates().getMode());
         Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = ObserveBusinessProject.get().getOptionalFormDefinition(BranchlineDto.class);
         optionalFormDefinition.ifPresent(t -> branchlineObsUI.getModel().getReferenceCache().loadReferentialReferenceSetsInModel(t, true));
         branchlineUIModel.setForm(branchlineDtoForm);
@@ -171,7 +170,8 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
         // TODO Use a cache of templates on setLongline (session scope)
         model.getSectionTemplatesTableModel().setData(new ArrayList<>());
 
-        branchlineObsUI.edit(null);
+        BranchlineDto selectedRow = model.getBranchlinesTableModel().getSelectedRow();
+        branchlineObsUI.edit(selectedRow);
     }
 
     @Override
@@ -180,6 +180,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
         SetDetailCompositionUIModel model = getModel();
         List<SectionWithTemplateDto> section = SectionWithTemplateDto.getSectionTemplates(model.getStates().getBean().getSection());
         model.getSectionsTableModel().setData(section);
+        SetDetailCompositionUIValidationHelper validationHelper = model.getValidationHelper();
         validationHelper.setObjectValueAdjusting(true);
         try {
             model.getSectionTemplatesTableModel().onSectionTemplatesTableModelModified(false);
@@ -306,10 +307,6 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition
         }
     }
 
-    public SetDetailCompositionUIValidationHelper getValidationHelper() {
-        return validationHelper;
-    }
-
     protected void editBranchline(BranchlineDto branchline) {
         boolean changed = ui.getValidator().isChanged();
         try {


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIModel.java
=====================================
@@ -246,7 +246,7 @@ public class SetDetailCompositionUIModel extends GeneratedSetDetailCompositionUI
     public void init(ContentUI ui, DefaultUIInitializerResult initializerResult) {
         super.init(ui, initializerResult);
         SetDetailCompositionUI ui1 = (SetDetailCompositionUI) ui;
-        validationHelper = ui1.getHandler().getValidationHelper();
+        validationHelper = new SetDetailCompositionUIValidationHelper(ui1);
         getSectionTemplatesTableModel().init(ui1);
         getSectionsTableModel().init();
         getBasketsTableModel().init(ui1);


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUIHandler.java
=====================================
@@ -56,6 +56,15 @@ class SetGlobalCompositionUIHandler extends GeneratedSetGlobalCompositionUIHandl
         getContentOpen().initTabUI(ui.getBaitsCompositionUI(), ui.getBaitsCompositionPanel(), 3);
     }
 
+    @Override
+    public void onMainTabChanged(int previousIndex, int selectedIndex) {
+        super.onMainTabChanged(previousIndex, selectedIndex);
+        ui.getFloatlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 0 && ui.getFloatlinesCompositionUI().getTableModel().getRowCount() > 1);
+        ui.getBranchlinesCompositionUI().getSelectToolbar().setVisible(selectedIndex == 1 && ui.getBranchlinesCompositionUI().getTableModel().getRowCount() > 1);
+        ui.getHooksCompositionUI().getSelectToolbar().setVisible(selectedIndex == 2 && ui.getHooksCompositionUI().getTableModel().getRowCount() > 1);
+        ui.getBaitsCompositionUI().getSelectToolbar().setVisible(selectedIndex == 3 && ui.getBaitsCompositionUI().getTableModel().getRowCount() > 1);
+    }
+
     @Override
     protected void installResetAction() {
         ResetForm.installAction(ui, ui.getReset(), new DefaultResetAdapter<SetGlobalCompositionUI>() {


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/CompositionAutoSelectRowAndShowPopupAction.java
=====================================
@@ -26,7 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSi
 import fr.ird.observe.client.datasource.editor.api.content.ui.table.EditableTableModelSupport;
 import fr.ird.observe.client.datasource.editor.api.content.ui.table.popup.AutoSelectRowAndShowPopupActionSupport;
 import fr.ird.observe.client.datasource.editor.ll.data.observation.SetDetailCompositionUI;
-import fr.ird.observe.dto.data.DataDto;
+import fr.ird.observe.dto.IdDto;
 import fr.ird.observe.dto.data.ll.observation.SetDetailCompositionDto;
 
 import javax.swing.JMenuItem;
@@ -57,11 +57,11 @@ public class CompositionAutoSelectRowAndShowPopupAction extends AutoSelectRowAnd
 
     @Override
     protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) {
-        @SuppressWarnings("unchecked") EditableTableModelSupport<DataDto> model = (EditableTableModelSupport<DataDto>) getTable().getModel();
+        @SuppressWarnings("unchecked") EditableTableModelSupport<IdDto> model = (EditableTableModelSupport<IdDto>) getTable().getModel();
         boolean selectionNotEmpty = !model.isSelectionEmpty();
         boolean selectedRowIsNotEmpty = false;
         if (selectionNotEmpty) {
-            DataDto selectedData = model.getSelectedRow();
+            IdDto selectedData = model.getSelectedRow();
             selectedRowIsNotEmpty = model.isRowNotEmpty(selectedData);
         }
 


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/SetDetailCompositionUIValidationHelper.java
=====================================
@@ -60,7 +60,7 @@ public class SetDetailCompositionUIValidationHelper {
 
     public SetDetailCompositionUIValidationHelper(SetDetailCompositionUI ui) {
         this.model = ui.getModel();
-        this.errorTableModel = (ContentMessageTableModel) ui.getErrorTableModel();
+        this.errorTableModel = ui.getErrorTableModel();
         SwingValidator<SectionDto> sectionValidator = ui.getSectionValidator();
         SwingValidator<BasketDto> basketValidator = ui.getBasketValidator();
         SwingValidator<BranchlineDto> branchlineValidator = ui.getBranchlineValidator();


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/basket/BasketTableModel.java
=====================================
@@ -60,7 +60,7 @@ public class BasketTableModel extends LonglineCompositionTableModelSupport<Baske
     }
 
     public void init(SetDetailCompositionUI ui) {
-        validationHelper = ui.getHandler().getValidationHelper();
+        validationHelper = ui.getModel().getValidationHelper();
 
         PropertyChangeListener basketsTableModelModified = evt -> {
             Boolean newValue = (Boolean) evt.getNewValue();


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/composition/branchline/BranchlineTableModel.java
=====================================
@@ -132,6 +132,8 @@ public class BranchlineTableModel extends LonglineCompositionTableModelSupport<B
                 result = !isGenerateHaulingIds();
                 break;
             case 2:
+            case 3:
+                // can always change length ?
                 result = true;
                 break;
             default:


=====================================
pom.xml
=====================================
@@ -155,7 +155,7 @@
 
 <!--    <lib.version.java4all.topia>1.31</lib.version.java4all.topia>-->
     <!--    <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>-->
-    <lib.version.java4all.jaxx>3.0-alpha-85-SNAPSHOT</lib.version.java4all.jaxx>
+    <lib.version.java4all.jaxx>3.0-alpha-85</lib.version.java4all.jaxx>
     <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
     <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->
     <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fb0090f8d4acbb49eb2c8c1bb...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fb0090f8d4acbb49eb2c8c1bb...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)