[jboss-svn-commits] JBL Code SVN: r25698 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/workflow/core/impl and 1 other directories.

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

Author: KrisVerlaenen
Date: 2009-03-17 20:31:23 -0400 (Tue, 17 Mar 2009)
New Revision: 25698

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/MilestoneNodeHandler.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ExtendedNodeImpl.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/view/property/EditListDialog.java
Log:
JBRULES-1966: Editing existing ruleflow Action node not detected as a file change in eclipse plugin
 - list editor now also supports editing of items again
 - fixed issue when saving milestone node with only an action defined (no constraint or timers)

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/MilestoneNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/MilestoneNodeHandler.java	2009-03-18 00:16:35 UTC (rev 25697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/MilestoneNodeHandler.java	2009-03-18 00:31:23 UTC (rev 25698)
@@ -33,7 +33,7 @@
 		MilestoneNode milestoneNode = (MilestoneNode) node;
 		writeNode("milestone", milestoneNode, xmlDump, includeMeta);
         String constraint = milestoneNode.getConstraint();
-        if (constraint != null || milestoneNode.getTimers() != null) {
+        if (constraint != null || milestoneNode.getTimers() != null || milestoneNode.containsActions()) {
             xmlDump.append(">\n");
             if (constraint != null) {
             	xmlDump.append("      <constraint type=\"rule\" dialect=\"mvel\" >"

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ExtendedNodeImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ExtendedNodeImpl.java	2009-03-18 00:16:35 UTC (rev 25697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ExtendedNodeImpl.java	2009-03-18 00:31:23 UTC (rev 25698)
@@ -30,6 +30,15 @@
 		return this.actions.get(type);
 	}
 	
+	public boolean containsActions() {
+		for (List<DroolsAction> l: actions.values()) {
+			if (!l.isEmpty()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
 	public String[] getActionTypes() {
 		return EVENT_TYPES;
 	}

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/view/property/EditListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/view/property/EditListDialog.java	2009-03-18 00:16:35 UTC (rev 25697)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/flow/common/view/property/EditListDialog.java	2009-03-18 00:31:23 UTC (rev 25698)
@@ -145,11 +145,15 @@
         EditBeanDialog<T> dialog = createEditItemDialog();
         Iterator<T> iterator = ((StructuredSelection) listViewer.getSelection()).iterator();
         if (iterator.hasNext()) {
-            dialog.setValue(iterator.next());
+        	T value = iterator.next();
+            int index = newList.lastIndexOf(value);
+            dialog.setValue(value);
             int code = dialog.open();
-            Object result = dialog.getValue();
             if (code != CANCEL) {
-                listViewer.update(result, null);
+                T result = dialog.getValue();
+            	newList.set(index, result);
+                listViewer.remove(value);
+                listViewer.add(result);
             }
         }
     }