[Observe-commits] 07/13: Amélioration api node

13 Aug 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/4309_synchro_referential in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 4764b165876f4a4e968e0c588def13198a17eec2
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Aug 11 11:38:38 2016 +0200

    Amélioration api node
---
 .../tree/node/ReferenceReferentialSynchroNode.java |  5 ++
 .../tree/node/ReferentialSynchroNodeSupport.java   | 60 ++++++++++++----
 .../ng/tree/node/RootReferentialSynchroNode.java   | 80 +++++-----------------
 .../ng/tree/node/TypeReferentialSynchroNode.java   | 73 +++++---------------
 4 files changed, 84 insertions(+), 134 deletions(-)

diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNode.java
index 46b6114..ba1e41a 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNode.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNode.java
@@ -25,6 +25,11 @@ public class ReferenceReferentialSynchroNode extends ReferentialSynchroNodeSuppo
     }
 
     @Override
+    public TypeReferentialSynchroNode getParent() {
+        return (TypeReferentialSynchroNode) super.getParent();
+    }
+
+    @Override
     public ReferentialReference getUserObject() {
         return (ReferentialReference) super.getUserObject();
     }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java
index 635643f..487b54f 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java
@@ -11,15 +11,15 @@ public abstract class ReferentialSynchroNodeSupport extends DefaultMutableTreeNo
 
     private static final long serialVersionUID = 1L;
 
+    private final boolean left;
+    private final ReferentialSynchroNodeType nodeType;
+
     protected ReferentialSynchroNodeSupport(boolean left, ReferentialSynchroNodeType nodeType, Object userObject) {
         this.left = left;
         this.nodeType = nodeType;
         setUserObject(userObject);
     }
 
-    private final boolean left;
-    private final ReferentialSynchroNodeType nodeType;
-
     public boolean isLeft() {
         return left;
     }
@@ -32,22 +32,52 @@ public abstract class ReferentialSynchroNodeSupport extends DefaultMutableTreeNo
         return nodeType;
     }
 
-    public abstract boolean canAddToLeft();
-    public abstract boolean canAddToRight();
+    public boolean canRevertToLeft() {
+        return false;
+    }
+
+    public boolean canRevertToRight() {
+        return false;
+    }
+
+    public boolean canAddToLeft() {
+        return false;
+    }
+
+    public boolean canAddToRight() {
+        return false;
+    }
+
+    public boolean canUpdateToLeft() {
+        return false;
+    }
+
+    public boolean canUpdateToRight() {
+        return false;
+    }
+
+    public boolean canDeleteFromLeft() {
+        return false;
+    }
 
-    public abstract boolean canUpdateToLeft();
-    public abstract boolean canUpdateToRight();
+    public boolean canDeleteFromRight() {
+        return false;
+    }
 
-    public abstract boolean canRevertToLeft();
-    public abstract boolean canRevertToRight();
+    public boolean canDesactivateFromLeft() {
+        return false;
+    }
 
-    public abstract boolean canDeleteFromLeft();
-    public abstract boolean canDeleteFromRight();
+    public boolean canDesactivateFromRight() {
+        return false;
+    }
 
-    public abstract boolean canDesactivateFromLeft();
-    public abstract boolean canDesactivateFromRight();
+    public boolean canDesactivateFromLeftWithReplace() {
+        return false;
+    }
 
-    public abstract boolean canDesactivateFromLeftWithReplace();
-    public abstract boolean canDesactivateFromRightWithReplace();
+    public boolean canDesactivateFromRightWithReplace() {
+        return false;
+    }
 
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java
index 05a0f05..6df1105 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/RootReferentialSynchroNode.java
@@ -2,6 +2,8 @@ package fr.ird.observe.ui.admin.synchronize.referential.ng.tree.node;
 
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 
+import java.util.Enumeration;
+
 /**
  * Created on 10/08/16.
  *
@@ -14,69 +16,23 @@ public class RootReferentialSynchroNode extends ReferentialSynchroNodeSupport {
         super(left, ReferentialSynchroNodeType.ROOT, null);
     }
 
-    @Override
-    public boolean canRevertToLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canRevertToRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canAddToLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canAddToRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canUpdateToLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canUpdateToRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canDeleteFromLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canDeleteFromRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromLeftWithReplace() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromRightWithReplace() {
-        return false;
+    public <R extends ReferentialDto> TypeReferentialSynchroNode getOrAddTypeNode(Class<R> referentialName) {
+        TypeReferentialSynchroNode node = getChild(referentialName);
+        if (node == null) {
+            node = new TypeReferentialSynchroNode(isLeft(), referentialName);
+            add(node);
+        }
+        return node;
     }
 
-    public <R extends ReferentialDto> TypeReferentialSynchroNode addTypeNode(Class<R> referentialName) {
-        TypeReferentialSynchroNode node = new TypeReferentialSynchroNode(isLeft(), referentialName);
-        add(node);
-        return node;
+    public <R extends ReferentialDto> TypeReferentialSynchroNode getChild(Class<R> referentialName) {
+        Enumeration children = children();
+        while (children.hasMoreElements()) {
+            TypeReferentialSynchroNode o = (TypeReferentialSynchroNode) children.nextElement();
+            if (referentialName.equals(o.getUserObject())) {
+                return o;
+            }
+        }
+        return null;
     }
 }
diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java
index ebe382d..8378773 100644
--- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java
+++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java
@@ -3,6 +3,8 @@ package fr.ird.observe.ui.admin.synchronize.referential.ng.tree.node;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 
+import java.util.Enumeration;
+
 /**
  * Created on 09/08/16.
  *
@@ -17,68 +19,24 @@ public class TypeReferentialSynchroNode extends ReferentialSynchroNodeSupport {
     }
 
     @Override
-    public Class<? extends ReferentialDto> getUserObject() {
-        return (Class) super.getUserObject();
-    }
-
-    @Override
-    public boolean canRevertToLeft() {
-        return false;
+    public RootReferentialSynchroNode getParent() {
+        return (RootReferentialSynchroNode) super.getParent();
     }
 
-    @Override
-    public boolean canRevertToRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canAddToLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canAddToRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canUpdateToLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canUpdateToRight() {
-        return false;
+    public <R extends ReferentialDto> ReferenceReferentialSynchroNode getChild(String id) {
+        Enumeration children = children();
+        while (children.hasMoreElements()) {
+            ReferenceReferentialSynchroNode o = (ReferenceReferentialSynchroNode) children.nextElement();
+            if (id.equals(o.getUserObject().getId())) {
+                return o;
+            }
+        }
+        return null;
     }
 
     @Override
-    public boolean canDeleteFromLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canDeleteFromRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromLeft() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromRight() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromLeftWithReplace() {
-        return false;
-    }
-
-    @Override
-    public boolean canDesactivateFromRightWithReplace() {
-        return false;
+    public Class<? extends ReferentialDto> getUserObject() {
+        return (Class) super.getUserObject();
     }
 
     public <R extends ReferentialDto> ReferenceReferentialSynchroNode addDeleteNode(ReferentialReference<R> referentialReference) {
@@ -104,4 +62,5 @@ public class TypeReferentialSynchroNode extends ReferentialSynchroNodeSupport {
         add(node);
         return node;
     }
+
 }

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 07/13: Amélioration api node

codelutin.com scm