r970 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model - Simexplorer-si-commits

14 Feb 2008

Author: tchemit
Date: 2008-02-14 15:39:40 +0000 (Thu, 14 Feb 2008)
New Revision: 970

Modified:
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java
Log:
ajout de la propri?\195?\169t?\195?\169 remote lors de la construction de l'arbre + utilisation de LoggableElementTreeNode au lieu de TreeNode + suppression methodes de tests d'actions (voir EntitiesAction)

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java
===================================================================

--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java	2008-02-14 15:38:28 UTC (rev 969)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java	2008-02-14 15:39:40 UTC (rev 970)
@@ -32,7 +32,6 @@
 import static org.codelutin.i18n.I18n._;
 
 import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
 /**
@@ -91,7 +90,7 @@
                 return null;
             }
             node = (LoggableElementTreeNode) o;
-        }        
+        }
         return node;
     }
 
@@ -106,167 +105,137 @@
         return node;
     }
 
-    public static boolean isLoggableElement(LoggableElementTreeNode node) {
-        return node != null && node.isLoggableElement();
-    }
-
-    public static boolean canExport(LoggableElementTreeNode node) {
-        return isLoggableElement(node) && node.getUserObject() instanceof ExplorationApplication;
-    }
-
-    public static boolean canDelete(LoggableElementTreeNode node) {
-        return node != null && node.isLoggableElement();
-    }
-
-    public static boolean canDownload(LoggableElementTreeNode node) {
-        return node != null && node.isDownloadableElement();
-    }
-
-    public static TypeNode getTypeNode(LoggableElementTreeNode node) {
-        Object userObject = node.getUserObject();
-        if (userObject instanceof String) {
-            // do not treate string
-            return null;
-        }
-        for (TypeNode typeNode : TypeNode.values()) {
-            if (typeNode.getKlass() == node.getClass()) {
-                return typeNode;
-            }
-        }
-        return null;
-    }
-
-    public static TreeNode buildLoggableElementNode(LoggableElement element) {
+    public static LoggableElementTreeNode buildLoggableElementNode(LoggableElement element, boolean remote) {
         if (element instanceof ExplorationApplication) {
-            return buildExplorationApplicationNode(null, (ExplorationApplication) element);
+            return buildExplorationApplicationNode(null, (ExplorationApplication) element, remote);
         }
         if (element instanceof Component) {
-            return buildComponentNode(null, (Component) element);
+            return buildComponentNode(null, (Component) element, remote);
         }
         if (element instanceof ExplorationData) {
-            return buildExplorationDataNode(null, (ExplorationData) element);
+            return buildExplorationDataNode(null, (ExplorationData) element, remote);
         }
 
         if (element instanceof Library) {
-            return buildLibraryNode(null, (Library) element);
+            return buildLibraryNode(null, (Library) element, remote);
         }
         throw new SimExplorerRuntimeException("could not foud a builder for " + element);
 
     }
 
-    public static TreeNode buildExplorationApplicationNode(LoggableElementTreeNode parent, ExplorationApplication element) {
-        LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true);
+    public static LoggableElementTreeNode buildExplorationApplicationNode(LoggableElementTreeNode parent, ExplorationApplication element, boolean remote) {
+        LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, remote, true);
         LoggableElementTreeNode tmpNode;
         // build components node and his childs        
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), remote, true);
         if (element.getComponents() != null) {
             for (Component component : element.getComponents()) {
-                buildComponentNode(tmpNode, component);
+                buildComponentNode(tmpNode, component, remote);
             }
         }
 
         // build explorations node and his childs
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), remote, true);
         if (element.getExplorations() != null) {
             for (ExplorationData explorationData : element.getExplorations()) {
-                buildExplorationDataNode(tmpNode, explorationData);
+                buildExplorationDataNode(tmpNode, explorationData, remote);
             }
         }
         return result;
     }
 
-    public static TreeNode buildComponentNode(LoggableElementTreeNode parent, Component element) {
+    public static LoggableElementTreeNode buildComponentNode(LoggableElementTreeNode parent, Component element, boolean remote) {
 
-        LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true);
+        LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, remote, true);
         LoggableElementTreeNode tmpNode;
 
         // build constantes nodes
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), remote, true);
         if (element.getConstants() != null) {
             for (Constant constante : element.getConstants()) {
-                buildConstantNode(tmpNode, constante);
+                buildConstantNode(tmpNode, constante, remote);
             }
         }
 
         // build structures nodes
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), remote, true);
         if (element.getStructures() != null) {
             for (Structure structure : element.getStructures()) {
-                buildStructureNode(tmpNode, structure);
+                buildStructureNode(tmpNode, structure, remote);
             }
         }
 
         // build Codes nodes
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), remote, true);
         if (element.getCodes() != null) {
             for (Code code : element.getCodes()) {
-                buildCodeNode(tmpNode, code);
+                buildCodeNode(tmpNode, code, remote);
             }
         }
 
         // build libraries nodes
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), remote, true);
         if (element.getLibraries() != null) {
             for (Library library : element.getLibraries()) {
-                buildLibraryNode(tmpNode, library);
+                buildLibraryNode(tmpNode, library, remote);
             }
         }
 
         return result;
     }
 
-    public static LoggableElementTreeNode buildExplorationDataNode(LoggableElementTreeNode parent, ExplorationData element) {
-        LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, true);
+    public static LoggableElementTreeNode buildExplorationDataNode(LoggableElementTreeNode parent, ExplorationData element, boolean remote) {
+        LoggableElementTreeNode result = new LoggableElementTreeNode(parent, element, remote, true);
         LoggableElementTreeNode tmpNode;
         // build constant values nodes
-        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), true);
+        tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), remote, true);
         if (element.getValuesMap() != null) {
             for (ConstantValue library : element.getValuesMap()) {
-                buildConstantValueNode(tmpNode, library);
+                buildConstantValueNode(tmpNode, library, remote);
             }
         }
         // build result node
         if (element.getResult() != null) {
-            buildResultNode(result, element.getResult());
+            buildResultNode(result, element.getResult(), remote);
         }
         return result;
     }
 
-    public static TreeNode buildLibraryNode(LoggableElementTreeNode parent, Library element) {
+    public static LoggableElementTreeNode buildLibraryNode(LoggableElementTreeNode parent, Library element, boolean remote) {
         LoggableElementTreeNode result;
-        result = new LoggableElementTreeNode(parent, element, false);
+        result = new LoggableElementTreeNode(parent, element, remote, false);
         return result;
     }
 
-    public static TreeNode buildCodeNode(LoggableElementTreeNode parent, Code element) {
+    public static LoggableElementTreeNode buildCodeNode(LoggableElementTreeNode parent, Code element, boolean remote) {
         LoggableElementTreeNode result;
-        result = new LoggableElementTreeNode(parent, element, false);
+        result = new LoggableElementTreeNode(parent, element, remote, false);
         return result;
     }
 
-    public static TreeNode buildStructureNode(LoggableElementTreeNode parent, Structure element) {
+    public static LoggableElementTreeNode buildStructureNode(LoggableElementTreeNode parent, Structure element, boolean remote) {
         LoggableElementTreeNode result;
-        result = new LoggableElementTreeNode(parent, element, false);
+        result = new LoggableElementTreeNode(parent, element, remote, false);
         return result;
     }
 
-    public static TreeNode buildConstantNode(LoggableElementTreeNode parent, Constant element) {
+    public static LoggableElementTreeNode buildConstantNode(LoggableElementTreeNode parent, Constant element, boolean remote) {
         LoggableElementTreeNode result;
-        result = new LoggableElementTreeNode(parent, element, false);
+        result = new LoggableElementTreeNode(parent, element, remote, false);
         return result;
     }
 
 
-    public static TreeNode buildConstantValueNode(LoggableElementTreeNode parent, ConstantValue element) {
+    public static LoggableElementTreeNode buildConstantValueNode(LoggableElementTreeNode parent, ConstantValue element, boolean remote) {
         LoggableElementTreeNode result;
-        result = new LoggableElementTreeNode(parent, element.getConstant().getName(), true);
-        result.add(new LoggableElementTreeNode(result, element.getValue(), false));
+        result = new LoggableElementTreeNode(parent, element.getConstant().getName(), remote, true);
+        result.add(new LoggableElementTreeNode(result, element.getValue(), remote, false));
         return result;
     }
 
-    public static TreeNode buildResultNode(LoggableElementTreeNode parent, Result element) {
+    public static LoggableElementTreeNode buildResultNode(LoggableElementTreeNode parent, Result element, boolean remote) {
         LoggableElementTreeNode result;
-        result = new LoggableElementTreeNode(parent, element, false);
+        result = new LoggableElementTreeNode(parent, element, remote, false);
         return result;
     }

    

r970 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model

tchemit＠users.labs.libre-entreprise.org

tags

participants (1)