[jboss-svn-commits] JBL Code SVN: r20111 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2008-05-22 07:56:44 -0400 (Thu, 22 May 2008)
New Revision: 20111

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java
Log:
JBRULES-1616: Composite Node
 - improved xml serialization

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java	2008-05-22 11:19:17 UTC (rev 20110)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java	2008-05-22 11:56:44 UTC (rev 20111)
@@ -37,17 +37,22 @@
     }
 
     public void addNode(Node node) {
-    	long id = 0;
-        for (Node n: nodeContainer.getNodes()) {
-            if (n.getId() > id) {
-                id = n.getId();
-            }
-        }
-        node.setId(++id);
-        nodeContainer.addNode(node);
+    	// TODO find a more elegant solution for this
+    	// preferrable remove id setting from this class
+    	// and delegate to GUI command that drops node
+    	if (node.getId() <= 0) {
+	    	long id = 0;
+	        for (Node n: nodeContainer.getNodes()) {
+	            if (n.getId() > id) {
+	                id = n.getId();
+	            }
+	        }
+	        node.setId(++id);
+    	}
+    	nodeContainer.addNode(node);
         node.setNodeContainer(this);
     }
-
+    
     public void removeNode(Node node) {
         nodeContainer.removeNode(node);
         node.setNodeContainer(null);