[Observe-commits] [Git][ultreiaio/ird-observe][develop] 2 commits: Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759)

30 Mar 2017

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


Commits:
fa4fdc2d by Tony CHEMIT at 2017-03-30T09:16:27+02:00
Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759)

- - - - -
fbe132a3 by Tony CHEMIT at 2017-03-30T09:20:15+02:00
Ne pas modifier le formulaire si on resélectionne dans l'abre le nœud courant (See #759)

- - - - -


2 changed files:

- application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
=====================================

--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
@@ -547,7 +547,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U
 
         try {
             ok = doDelete(getBean());
-
+            if (!ok) {
+                ui.restartEdit();
+            }
         } catch (Exception e) {
             UIHelper.handlingError(e);
         } finally {


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java
@@ -91,7 +91,7 @@ public class NavigationTree extends JXTree {
         setSelectionModel(new DefaultTreeSelectionModel() {
             @Override
             public void setSelectionPath(TreePath path) {
-                boolean canChange = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI();
+                boolean canChange = !Objects.equals(path, getSelectionPath()) && ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI();
                 if (!canChange) {
                     // cancel the change of node
                     return;



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

    