[jboss-svn-commits] JBL Code SVN: r31414 - 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 16:07:09 -0500 (Thu, 04 Feb 2010)
New Revision: 31414

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
Log:
Guided Editor:
	Added the possibility to remove Source Pattern of Accumulate.

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java	2010-02-04 20:53:40 UTC (rev 31413)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java	2010-02-04 21:07:09 UTC (rev 31414)
@@ -1,5 +1,6 @@
 package org.drools.guvnor.client.modeldriven.ui;
 
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
@@ -11,7 +12,6 @@
 import com.gwtext.client.widgets.TabPanel;
 import org.drools.guvnor.client.common.ClickableLabel;
 import org.drools.guvnor.client.common.DirtyableFlexTable;
-import org.drools.guvnor.client.common.DirtyableVerticalPane;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
 import org.drools.guvnor.client.modeldriven.brl.FactPattern;
@@ -66,7 +66,6 @@
         if (this.getFromAccumulatePattern().getSourcePattern() == null) {
             panel.setWidget(r++, 0, new ClickableLabel("<br> <font color='red'>" + constants.clickToAddPattern() + "</font>", sourcePatternClick, !this.modeller.lockLHS()));
         } else {
-            DirtyableVerticalPane vert = new DirtyableVerticalPane();
             IPattern rPattern = this.getFromAccumulatePattern().getSourcePattern();
 
             Widget patternWidget = null;
@@ -82,10 +81,17 @@
                 throw new IllegalArgumentException("Unsuported pattern " + rPattern + " for right side of FROM ACCUMULATE");
             }
 
-            vert.add(patternWidget);
             panel.setWidget(r++,
                     0,
-                    vert);
+                    addRemoveButton(patternWidget, new ClickListener() {
+
+                public void onClick(Widget sender) {
+                    if (Window.confirm(constants.RemoveThisBlockOfData())) {
+                        getFromAccumulatePattern().setSourcePattern(null);
+                        modeller.refreshWidget();
+                    }
+                }
+            }));
         }
 
         TabPanel tPanel = new TabPanel();

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:53:40 UTC (rev 31413)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-02-04 21:07:09 UTC (rev 31414)
@@ -83,7 +83,7 @@
                     addRemoveButton(patternWidget, new ClickListener() {
 
                 public void onClick(Widget sender) {
-                    if (Window.confirm(constants.RemoveThisEntireConditionQ())) {
+                    if (Window.confirm(constants.RemoveThisBlockOfData())) {
                         getFromCollectPattern().setRightPattern(null);
                         modeller.refreshWidget();
                     }