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

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

Author: eaa
Date: 2010-02-04 15:06:24 -0500 (Thu, 04 Feb 2010)
New Revision: 31410

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
Log:
Guided Editor:
	From Collect now support From Collect and From Accumulate as Right Pattern

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-02-04 20:03:52 UTC (rev 31409)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-02-04 20:06:24 UTC (rev 31410)
@@ -12,6 +12,7 @@
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
+import org.drools.guvnor.client.modeldriven.brl.FromAccumulateCompositeFactPattern;
 import org.drools.guvnor.client.modeldriven.brl.FromCollectCompositeFactPattern;
 import org.drools.guvnor.client.modeldriven.brl.FromCompositeFactPattern;
 import org.drools.guvnor.client.modeldriven.brl.IPattern;
@@ -65,7 +66,11 @@
 
             Widget patternWidget = null;
             if (rPattern instanceof FactPattern) {
-                patternWidget = new FactPatternWidget(modeller, rPattern, constants.All0with(), false);
+                patternWidget = new FactPatternWidget(modeller, rPattern, constants.All0with(), true);
+            } else if (rPattern instanceof FromAccumulateCompositeFactPattern) {
+                patternWidget = new FromAccumulateCompositeFactPatternWidget(modeller, (FromAccumulateCompositeFactPattern) rPattern);
+            } else if (rPattern instanceof FromCollectCompositeFactPattern) {
+                patternWidget = new FromCollectCompositeFactPatternWidget(modeller, (FromCollectCompositeFactPattern) rPattern);
             } else if (rPattern instanceof FromCompositeFactPattern) {
                 patternWidget = new FromCompositeFactPatternWidget(modeller, (FromCompositeFactPattern) rPattern);
             } else {
@@ -151,16 +156,37 @@
             }
         });
 
-        final Button fromBtn = new Button(constants.From(), new ClickListener() {
 
+        final Button fromBtn = new Button(constants.From());
+        final Button fromAccumulateBtn = new Button(constants.FromAccumulate());
+        final Button fromCollectBtn = new Button(constants.FromCollect());
+
+        ClickListener btnsClickListener = new ClickListener() {
+
             public void onClick(Widget sender) {
-                getFromCollectPattern().setRightPattern(new FromCompositeFactPattern());
+
+                if (sender == fromBtn) {
+                    getFromCollectPattern().setRightPattern(new FromCompositeFactPattern());
+                } else if (sender == fromAccumulateBtn) {
+                    getFromCollectPattern().setRightPattern(new FromAccumulateCompositeFactPattern());
+                } else if (sender == fromCollectBtn) {
+                    getFromCollectPattern().setRightPattern(new FromCollectCompositeFactPattern());
+                } else {
+                    throw new IllegalArgumentException("Unknown sender: " + sender);
+                }
+
                 modeller.refreshWidget();
                 popup.hide();
             }
-        });
+        };
 
+        fromBtn.addClickListener(btnsClickListener);
+        fromAccumulateBtn.addClickListener(btnsClickListener);
+        fromCollectBtn.addClickListener(btnsClickListener);
+
         popup.addAttribute("", fromBtn);
+        popup.addAttribute("", fromAccumulateBtn);
+        popup.addAttribute("", fromCollectBtn);
 
 
         popup.show();