[Git][ultreiaio/ird-observe][develop] Enregistrement de FOB -> chagement d'onglet intempestif - Closes #1505 - Observe-commits

24 Jun 2020


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


Commits:
a76c2911 by Tony Chemit at 2020-06-24T19:04:50+02:00
Enregistrement de FOB -> chagement d'onglet intempestif - Closes #1505

- - - - -


5 changed files:

- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jaxx
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jaxx
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx


Changes:

=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java
=====================================
@@ -459,7 +459,14 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe
         // dettach all validators
         uninstallValidators();
     }
-
+    public void resetFromPreviousUi(U ui) {
+        if (tabbedPaneValidator != null) {
+            JTabbedPane mainTabbedPane = (JTabbedPane) ui.getObjectById(JaxxObjectInitializer.MAIN_TABBED_PANE);
+            if (mainTabbedPane != null) {
+                SwingUtilities.invokeLater(() -> ((JTabbedPane) this.ui.getObjectById(JaxxObjectInitializer.MAIN_TABBED_PANE)).setSelectedIndex((mainTabbedPane).getSelectedIndex()));
+            }
+        }
+    }
     final void destroyUI() {
         if (ui == null) {
             return;


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jaxx
=====================================
@@ -42,6 +42,10 @@
     @Override
     public abstract ObserveSwingValidator<D> getValidator();
 
+public void resetFromPreviousUi(U previousUi) {
+    getHandler().resetFromPreviousUi(previousUi);
+}
+
     ]]>
   </script>
 


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java
=====================================
@@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.content.data.edit.actions;
 
 import fr.ird.observe.client.datasource.api.ObserveDataSourcesManagerApplicationComponent;
 import fr.ird.observe.client.datasource.editor.content.ContentMode;
+import fr.ird.observe.client.datasource.editor.content.ContentUI;
 import fr.ird.observe.client.datasource.editor.content.actions.ContentUIActionSupport;
 import fr.ird.observe.client.datasource.editor.content.data.edit.ContentEditUI;
 import fr.ird.observe.client.datasource.editor.content.data.edit.ContentEditUIModel;
@@ -116,6 +117,9 @@ public abstract class SaveActionSupport<D extends DataDto, R extends DataDtoRefe
 
             // on sélectionne le nouveau noeud
             tree.selectSafeNode(node);
+            @SuppressWarnings({"RedundantExplicitVariableType", "unchecked"}) U newUi = (U) getDataSourceEditor().getContentUIManager().getSelectedContentUI();
+            newUi.resetFromPreviousUi(ui);
+
         } else {
 
             // on repaint le noeud et ses enfants


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jaxx
=====================================
@@ -43,6 +43,10 @@
     @Override
     public abstract ObserveSwingValidator<D> getValidator();
 
+public void resetFromPreviousUi(U previousUi) {
+    getHandler().resetFromPreviousUi(previousUi);
+}
+
     ]]>
   </script>
 


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx
=====================================
@@ -77,6 +77,10 @@ public abstract NormalTextEditor getUri();
 @Override
 public abstract ContentReferenceUIHandler<E, R, U> getHandler();
 
+public void resetFromPreviousUi(U previousUi) {
+    getHandler().resetFromPreviousUi(previousUi);
+}
+
 public void decorateUniqueKeyTable(JTable table,
                                    TableCellRenderer renderer,
                                    JScrollPane pane) {



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a76c291106d973d040c2406dd0...

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

    

[Git][ultreiaio/ird-observe][develop] Enregistrement de FOB -> chagement d'onglet intempestif - Closes #1505

Tony CHEMIT

tags

participants (1)