[jboss-svn-commits] JBL Code SVN: r32559 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui.

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

Author: eaa
Date: 2010-04-13 14:04:11 -0400 (Tue, 13 Apr 2010)
New Revision: 32559

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
Log:
JBRULES-2483: Free Form DRL Line in collect Pattern
	-FromCollectCompositeFactPatternWidget now supports FreeFormLineWidget as right pattern widget
	

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-04-13 18:00:19 UTC (rev 32558)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-04-13 18:04:11 UTC (rev 32559)
@@ -15,6 +15,7 @@
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FreeFormLine;
 import org.drools.guvnor.client.modeldriven.brl.FromAccumulateCompositeFactPattern;
 import org.drools.guvnor.client.modeldriven.brl.FromCollectCompositeFactPattern;
 import org.drools.guvnor.client.modeldriven.brl.FromCompositeFactPattern;
@@ -90,6 +91,8 @@
                 patternWidget = new FromCollectCompositeFactPatternWidget(this.getModeller(), (FromCollectCompositeFactPattern) rPattern,this.readOnly);
             } else if (rPattern instanceof FromCompositeFactPattern) {
                 patternWidget = new FromCompositeFactPatternWidget(this.getModeller(), (FromCompositeFactPattern) rPattern,this.readOnly);
+            } else if (rPattern instanceof FreeFormLine) {
+                patternWidget = new FreeFormLineWidget(this.getModeller(), (FreeFormLine) rPattern,this.readOnly);
             } else {
                 throw new IllegalArgumentException("Unsuported pattern " + rPattern + " for right side of FROM COLLECT");
             }
@@ -174,6 +177,7 @@
             }
         });
 
+        final Button freeFormDRLBtn = new Button(constants.FreeFormDrl());
         final Button fromBtn = new Button(constants.From());
         final Button fromAccumulateBtn = new Button(constants.FromAccumulate());
         final Button fromCollectBtn = new Button(constants.FromCollect());
@@ -188,6 +192,8 @@
                     getFromCollectPattern().setRightPattern(new FromAccumulateCompositeFactPattern());
                 } else if (sender == fromCollectBtn) {
                     getFromCollectPattern().setRightPattern(new FromCollectCompositeFactPattern());
+                } else if (sender == freeFormDRLBtn) {
+                    getFromCollectPattern().setRightPattern(new FreeFormLine());
                 } else {
                     throw new IllegalArgumentException("Unknown sender: " + sender);
                 }
@@ -197,10 +203,12 @@
             }
         };
 
+        freeFormDRLBtn.addClickListener(btnsClickListener);
         fromBtn.addClickListener(btnsClickListener);
         fromAccumulateBtn.addClickListener(btnsClickListener);
         fromCollectBtn.addClickListener(btnsClickListener);
 
+        popup.addAttribute("", freeFormDRLBtn);
         popup.addAttribute("", fromBtn);
         popup.addAttribute("", fromAccumulateBtn);
         popup.addAttribute("", fromCollectBtn);

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-04-13 18:00:19 UTC (rev 32558)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-04-13 18:04:11 UTC (rev 32559)
@@ -579,6 +579,7 @@
                     if (cmd != null) {
                         cmd.execute();
                     }
+                    verifyRule(null);
                 }
             }
         };