[jboss-svn-commits] JBL Code SVN: r35161 - in labs/jbossrules/trunk/drools-guvnor: src/main/java/org/drools/guvnor/client/modeldriven/ui and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Sep 16 04:23:27 EDT 2010


Author: nheron
Date: 2010-09-16 04:23:26 -0400 (Thu, 16 Sep 2010)
New Revision: 35161

Modified:
   labs/jbossrules/trunk/drools-guvnor/
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DefaultLiteralEditor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDown.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FreeFormLineWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java
   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/FromCompositeFactPatternWidget.java
Log:
removed deprecated gwt


Property changes on: labs/jbossrules/trunk/drools-guvnor
___________________________________________________________________
Name: svn:ignore
   - target
local

.metadata
.settings
.wtpmodules

nbproject

*.ipr
*.iws
*.iml


repository
tomcat
www
derby.log
repository.xml


.classpath
.project

   + target
local
.metadata
.settings
.wtpmodules
nbproject
*.ipr
*.iws
*.iml
repository
tomcat
www
derby.log
repository.xml
.classpath
.project
war


Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionInsertFactWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -18,9 +18,13 @@
 
 
 
-import org.drools.guvnor.client.common.*;
+import org.drools.guvnor.client.common.ClickableLabel;
+import org.drools.guvnor.client.common.DirtyableFlexTable;
+import org.drools.guvnor.client.common.FormStylePopup;
+import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.common.SmallLabel;
+import org.drools.guvnor.client.messages.Constants;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
-import org.drools.guvnor.client.messages.Constants;
 import org.drools.guvnor.client.util.Format;
 import org.drools.ide.common.client.modeldriven.DropDownData;
 import org.drools.ide.common.client.modeldriven.FieldAccessorsAndMutators;
@@ -29,10 +33,20 @@
 import org.drools.ide.common.client.modeldriven.brl.ActionInsertFact;
 import org.drools.ide.common.client.modeldriven.brl.ActionInsertLogicalFact;
 
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.*;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
 
 /**
  * This is used when asserting a new fact into working memory.
@@ -97,15 +111,15 @@
             inner.setWidget( i, 1 + col, valueEditor(val) );
             final int idx = i;
             Image remove = new ImageButton("images/delete_item_small.gif");
-            remove.addClickListener( new ClickListener() {
-                public void onClick(Widget w) {
-                	if (Window.confirm(constants.RemoveThisItem())) {
-                            model.removeField( idx );
-                            setModified(true);
-                            getModeller().refreshWidget();
-                	};
-                }
-            });
+			remove.addClickHandler(new ClickHandler() {
+				public void onClick(ClickEvent event) {
+					if (Window.confirm(constants.RemoveThisItem())) {
+						model.removeField(idx);
+						setModified(true);
+						getModeller().refreshWidget();
+					}
+				}
+			});
             if (!this.readOnly) {
                 inner.setWidget( i, 2 + col, remove );
             }
@@ -138,13 +152,16 @@
     private Widget getAssertLabel() {
 
 
-        ClickListener cl =  new ClickListener() {
-            public void onClick(Widget w) {
-                showAddFieldPopup(w);
-            }
-        };
+        ClickHandler cl = new ClickHandler(
+        		) {
+			
+			public void onClick(ClickEvent event) {
+				Widget w = (Widget)event.getSource();
+				showAddFieldPopup(w);
+				
+			}
+		};
 
-
         String assertType = "assert";  //NON-NLS
         if (this.model instanceof ActionInsertLogicalFact) {
             assertType = "assertLogical";  //NON-NLS
@@ -173,19 +190,18 @@
 
         popup.addAttribute( constants.AddField(),
                             box );
-        box.addChangeListener( new ChangeListener() {
-            public void onChange(Widget w) {
-                String fieldName = box.getItemText( box.getSelectedIndex() );
-                String fieldType = completions.getFieldType( model.factType,
-                                                             fieldName );
-                model.addFieldValue( new ActionFieldValue( fieldName,
-                                                           "",
-                                                           fieldType ) );
-                setModified(true);
-                getModeller().refreshWidget();
-                popup.hide();
-            }
-        } );
+		box.addChangeHandler(new ChangeHandler() {
+			public void onChange(ChangeEvent event) {
+				String fieldName = box.getItemText(box.getSelectedIndex());
+				String fieldType = completions.getFieldType(model.factType,
+						fieldName);
+				model.addFieldValue(new ActionFieldValue(fieldName, "",
+						fieldType));
+				setModified(true);
+				getModeller().refreshWidget();
+				popup.hide();
+			}
+		});
         /*
          * Propose a textBox to the user
          * to make him set a variable name 
@@ -198,21 +214,26 @@
         final Button ok = new Button( constants.Set() );
         vn.add( varName );
         vn.add( ok );
+        ok.addClickHandler(new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				String var = varName.getText();
+				if (getModeller().isVariableNameUsed(var)
+						&& ((model.getBoundName() != null && model
+								.getBoundName().equals(var) == false) || model
+								.getBoundName() == null)) {
+					Window.alert(Format.format(
+							constants.TheVariableName0IsAlreadyTaken(), var));
+					return;
+				}
+				model.setBoundName(var);
+				setModified(true);
+				getModeller().refreshWidget();
+				popup.hide();
+			}
+		});
+       
 
-        ok.addClickListener( new ClickListener() {
-            public void onClick(Widget w) {
-                String var = varName.getText();
-                if ( getModeller().isVariableNameUsed( var ) && ((model.getBoundName() != null && model.getBoundName().equals( var ) == false) || model.getBoundName() == null) ) {
-                    Window.alert( Format.format( constants.TheVariableName0IsAlreadyTaken(),
-                                                 var ) );
-                    return;
-                }
-                model.setBoundName( var );
-                setModified(true);
-                getModeller().refreshWidget();
-                popup.hide();
-            }
-        } );
         popup.addAttribute( constants.BoundVariable(),
                             vn );
         popup.show();

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionSetFieldWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -33,6 +33,10 @@
 import org.drools.ide.common.client.modeldriven.brl.ActionUpdateField;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.ChangeListener;
@@ -129,21 +133,22 @@
             final int idx = i;
             Image remove = new ImageButton("images/delete_item_small.gif"); //NON-NLS
             //Image remove = new ImageButton("images/delete_item_fade.gif"); //NON-NLS
-            remove.addClickListener(new ClickListener() {
-
-                public void onClick(Widget w) {
+            remove.addClickHandler(new ClickHandler() {
+				
+				public void onClick(ClickEvent event) {
                     if (Window.confirm(constants.RemoveThisItem())) {
                         model.removeField(idx);
                         setModified(true);
                         getModeller().refreshWidget();
                     }
-                }
-            });
+                }				
+			});
             if (!this.readOnly) {
                 layout.setWidget(i, 3, remove);
             }
-            remove.addMouseListener(new MouseListenerAdapter() {
 
+             remove.addMouseListener(new MouseListenerAdapter() {
+
                 @Override
                 public void onMouseEnter(Widget sender) {
                     super.onMouseEnter(sender);    //To change body of overridden methods use File | Settings | File Templates.
@@ -178,13 +183,14 @@
     private Widget getSetterLabel() {
 
 
-
-        ClickListener clk = new ClickListener() {
-
-            public void onClick(Widget w) {
-                showAddFieldPopup(w);
-            }
-        };
+        ClickHandler clk = new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget w = (Widget)event.getSource();
+				 showAddFieldPopup(w);
+				
+			}
+		};
         String modifyType = "set";
         if (this.model instanceof ActionUpdateField) {
             modifyType = "modify";
@@ -214,9 +220,9 @@
         box.setSelectedIndex(0);
 
         popup.addAttribute(constants.AddField(), box);
-        box.addChangeListener(new ChangeListener() {
-
-            public void onChange(Widget w) {
+        box.addChangeHandler(new ChangeHandler() {
+			
+			public void onChange(ChangeEvent event) {
                 String fieldName = box.getItemText(box.getSelectedIndex());
 
                 String fieldType = completions.getFieldType(variableClass, fieldName);
@@ -225,9 +231,10 @@
                 getModeller().refreshWidget();
                 popup.hide();
             }
-        });
+		});
 
 
+
         popup.show();
 
     }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/CompositeFactPatternWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -45,6 +45,8 @@
 
 import com.google.gwt.user.client.ui.*;
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Command;
 import java.util.ArrayList;
 import java.util.List;
@@ -137,12 +139,13 @@
     }
 
     protected Widget getCompositeLabel() {
-
-        ClickListener click =  new ClickListener() {
-            public void onClick(Widget w) {
-                showFactTypeSelector( w );
-            }
-        };
+    	ClickHandler click = new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget w = (Widget)event.getSource();
+				showFactTypeSelector( w );
+			}
+		};
         String lbl = HumanReadable.getCEDisplayName( pattern.type );
 
         if (pattern.patterns == null || pattern.patterns.length ==0) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -31,9 +31,11 @@
 import org.drools.ide.common.client.modeldriven.ui.ConstraintValueEditorHelper;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -305,22 +307,23 @@
             panel.add( new HTML( " " ) );
             panel.add( box );
             panel.add( new HTML( " " ) );
+			box.addChangeHandler(new ChangeHandler() {
 
-            box.addChangeListener( new ChangeListener() {
-                public void onChange(Widget w) {
-                    TextBox otherBox = (TextBox) w;
+				public void onChange(ChangeEvent event) {
+					TextBox otherBox = (TextBox) event.getSource();
 
-                    if ( !regex.equals( "" ) && !otherBox.getText().matches( regex ) ) {
-                        Window.alert( Format.format( constants.TheValue0IsNotValidForThisField(),
-                                                     otherBox.getText() ) );
-                        box.setText( oldValue );
-                    } else {
-                        oldValue = otherBox.getText();
-                        updateSentence();
-                        makeDirty();
-                    }
-                }
-            } );
+					if (!regex.equals("") && !otherBox.getText().matches(regex)) {
+						Window.alert(Format.format(
+								constants.TheValue0IsNotValidForThisField(),
+								otherBox.getText()));
+						box.setText(oldValue);
+					} else {
+						oldValue = otherBox.getText();
+						updateSentence();
+						makeDirty();
+					}
+				}
+			});
 
             initWidget( panel );
         }
@@ -399,13 +402,14 @@
                 }
                 if ( selected >= 0 ) list.setSelectedIndex( selected );
             }
-            list.addChangeListener( new ChangeListener() {
-                public void onChange(Widget w) {
-                    updateSentence();
-                    makeDirty();
-                }
-            } );
-
+            list.addChangeHandler(new ChangeHandler() {
+				
+				public void onChange(ChangeEvent event) {
+					 updateSentence();
+	                    makeDirty();
+				}
+			});
+ 
             initWidget( list );
             resultWidget = list;
         }
@@ -459,12 +463,15 @@
                 resultWidget.setSelectedIndex( 1 );
             }
 
-            resultWidget.addClickListener( new ClickListener() {
-                public void onClick(Widget w) {
-                    updateSentence();
-                }
-            } );
+            resultWidget.addClickHandler(new ClickHandler() {
+				
+				public void onClick(ClickEvent event) {
+					updateSentence();
+					
+				}
+			});
 
+
             resultWidget.setVisible( true );
             initWidget( resultWidget );
         }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DefaultLiteralEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DefaultLiteralEditor.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DefaultLiteralEditor.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -22,6 +22,14 @@
 import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.KeyDownEvent;
+import com.google.gwt.event.dom.client.KeyDownHandler;
+import com.google.gwt.event.dom.client.KeyPressEvent;
+import com.google.gwt.event.dom.client.KeyPressHandler;
+import com.google.gwt.event.dom.client.KeyUpEvent;
+import com.google.gwt.event.dom.client.KeyUpHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.ClickListener;
@@ -67,12 +75,13 @@
         this.numericValue = numericValue;
 
         textWidget.setStyleName( "x-form-field" );
+        textWidget.addClickHandler(new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				showPopup();
+			}
+		});
 
-        textWidget.addClickListener( new ClickListener() {
-            public void onClick(Widget arg0) {
-                showPopup();
-            }
-        } );
 
         if ( constraint.getValue() != null && !"".equals( constraint.getValue() ) ) {
             textWidget.setText( constraint.getValue() );
@@ -90,8 +99,9 @@
         popup.setPopupPosition( this.getAbsoluteLeft(),
                                 this.getAbsoluteTop() );
 
-        okButton.addClickListener( new ClickListener() {
-            public void onClick(Widget arg0) {
+        okButton.addClickHandler(new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
 
                 if ( !isValueEmpty( constraint.getValue() ) ) {
                     if (onValueChangeCommand != null){
@@ -102,7 +112,7 @@
                     popup.hide();
                 }
             }
-        } );
+		});
 
         horizontalPanel.add( getTextBox() );
         horizontalPanel.add( okButton );
@@ -116,9 +126,8 @@
     public TextBox getTextBox() {
 
         final TextBox box = new BoundTextBox( constraint );
+         box.addKeyboardListener( new KeyboardListener() {
 
-        box.addKeyboardListener( new KeyboardListener() {
-
             public void onKeyDown(Widget arg0,
                                   char arg1,
                                   int arg2) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDown.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDown.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDown.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -26,11 +26,11 @@
 import org.drools.ide.common.client.modeldriven.ui.ConstraintValueEditorHelper;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
-import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.Widget;
 
 /**
  * A drop down for enumerated values
@@ -49,14 +49,13 @@
         final Constants cs = GWT.create( Constants.class );
 
         this.valueChanged = valueChanged;
+		addChangeHandler(new ChangeHandler() {
+			public void onChange(ChangeEvent event) {
+				valueChanged.valueChanged(getItemText(getSelectedIndex()),
+						getValue(getSelectedIndex()));
+			}
+		});
 
-        addChangeListener( new ChangeListener() {
-            public void onChange(Widget w) {
-                valueChanged.valueChanged( getItemText( getSelectedIndex() ),
-                                           getValue( getSelectedIndex() ) );
-            }
-        } );
-
         //if we have to do it lazy, we will hit up the server when the widget gets focus
         if ( dropData.fixedList == null && dropData.queryExpression != null ) {
             DeferredCommand.addCommand( new Command() {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -20,19 +20,19 @@
 import org.drools.guvnor.client.messages.Constants;
 import org.drools.ide.common.client.modeldriven.DropDownData;
 import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
+import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
 import org.drools.ide.common.client.modeldriven.brl.FactPattern;
-import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.Widget;
 
 /**
  * 
@@ -71,13 +71,13 @@
     private Label getTextLabel() {
         Label label = new Label();
         label.setStyleName( "x-form-field" );
-
-        label.addClickListener( new ClickListener() {
-            public void onClick(Widget arg0) {
-                showPopup();
-            }
-        } );
-
+        label.addClickHandler(new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				showPopup();
+				
+			}
+		});
         if ( label.getText() == null && "".equals( label.getText() ) ) {
             label.setText( constants.Value() );
         }
@@ -92,15 +92,17 @@
         popup.setPopupPosition( this.getAbsoluteLeft(),
                                 this.getAbsoluteTop() );
 
-        okButton.addClickListener( new ClickListener() {
-            public void onClick(Widget arg0) {
-                executeOnValueChangeCommand();
+        okButton.addClickHandler(new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				executeOnValueChangeCommand();
                 panel.clear();
                 panel.add( textWidget );
                 popup.hide();
-            }
-        } );
-
+				
+			}
+		});
+ 
         horizontalPanel.add( enumDropDown );
         horizontalPanel.add( okButton );
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FreeFormLineWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FreeFormLineWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FreeFormLineWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -33,13 +33,17 @@
 
 import org.drools.guvnor.client.common.DirtyableFlexTable;
 import org.drools.guvnor.client.messages.Constants;
+import org.drools.ide.common.client.modeldriven.brl.FreeFormLine;
 
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.*;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
+import com.google.gwt.user.client.ui.HasHorizontalAlignment;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
 
-import org.drools.ide.common.client.modeldriven.brl.FreeFormLine;
-
 /**
  * Free form DRL line widget
  * @author esteban.aliverti at gmail.com
@@ -92,13 +96,15 @@
         tb.setTitle(constants.ThisIsADrlExpressionFreeForm());
 
         if (!this.readOnly) {
-            tb.addChangeListener(new ChangeListener() {
+        	tb.addChangeHandler(new ChangeHandler() {
+				
+				public void onChange(ChangeEvent event) {
+					  setModified(true);
+	                    action.text = tb.getText();
+					
+				}
+			});
 
-                public void onChange(Widget arg0) {
-                    setModified(true);
-                    action.text = tb.getText();
-                }
-            });
             
         } else {
             tb.setEnabled(false);

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromAccumulateCompositeFactPatternWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -16,17 +16,6 @@
 
 package org.drools.guvnor.client.modeldriven.ui;
 
-import com.google.gwt.user.client.Command;
-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;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.widgets.Panel;
-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.FormStylePopup;
@@ -38,6 +27,20 @@
 import org.drools.ide.common.client.modeldriven.brl.FromCompositeFactPattern;
 import org.drools.ide.common.client.modeldriven.brl.IPattern;
 
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.TabPanel;
+
 /**
  *
  * @author esteban
@@ -58,22 +61,21 @@
 
     @Override
     protected Widget getCompositeLabel() {
-
-        ClickListener leftPatternclick = new ClickListener() {
-
-            public void onClick(Widget w) {
+    	ClickHandler leftPatternclick =  new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget w= (Widget)event.getSource();
                 showFactTypeSelector(w);
-            }
-        };
+			}
+		};
+		ClickHandler sourcePatternClick = new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget w= (Widget)event.getSource();
+				 showSourcePatternSelector(w);
+			}
+		};
 
-        ClickListener sourcePatternClick = new ClickListener() {
-
-            public void onClick(Widget w) {
-                showSourcePatternSelector(w);
-            }
-        };
-
-
         String lbl = "<div class='x-form-field'>" + HumanReadable.getCEDisplayName("from accumulate") + "</div>";
 
         DirtyableFlexTable panel = new DirtyableFlexTable();
@@ -90,41 +92,58 @@
 
         if (this.getFromAccumulatePattern().getSourcePattern() == null) {
             panel.setWidget(r++, 0, new ClickableLabel("<br> <font color='red'>" + constants.clickToAddPattern() + "</font>", sourcePatternClick, !this.readOnly));
-        } else {
-            IPattern rPattern = this.getFromAccumulatePattern().getSourcePattern();
+		} else {
+			IPattern rPattern = this.getFromAccumulatePattern()
+					.getSourcePattern();
 
-            if (rPattern instanceof FactPattern) {
-                this.sourcePatternWidget = new FactPatternWidget(this.getModeller(), rPattern, constants.All0with(), true,this.readOnly);
-            } else if (rPattern instanceof FromAccumulateCompositeFactPattern) {
-                this.sourcePatternWidget = new FromAccumulateCompositeFactPatternWidget(this.getModeller(), (FromAccumulateCompositeFactPattern) rPattern,this.readOnly);
-            } else if (rPattern instanceof FromCollectCompositeFactPattern) {
-                this.sourcePatternWidget = new FromCollectCompositeFactPatternWidget(this.getModeller(), (FromCollectCompositeFactPattern) rPattern,this.readOnly);
-            } else if (rPattern instanceof FromCompositeFactPattern) {
-                this.sourcePatternWidget = new FromCompositeFactPatternWidget(this.getModeller(), (FromCompositeFactPattern) rPattern,this.readOnly);
-            } else {
-                throw new IllegalArgumentException("Unsuported pattern " + rPattern + " for right side of FROM ACCUMULATE");
-            }
+			if (rPattern instanceof FactPattern) {
+				this.sourcePatternWidget = new FactPatternWidget(
+						this.getModeller(), rPattern, constants.All0with(),
+						true, this.readOnly);
+			} else if (rPattern instanceof FromAccumulateCompositeFactPattern) {
+				this.sourcePatternWidget = new FromAccumulateCompositeFactPatternWidget(
+						this.getModeller(),
+						(FromAccumulateCompositeFactPattern) rPattern,
+						this.readOnly);
+			} else if (rPattern instanceof FromCollectCompositeFactPattern) {
+				this.sourcePatternWidget = new FromCollectCompositeFactPatternWidget(
+						this.getModeller(),
+						(FromCollectCompositeFactPattern) rPattern,
+						this.readOnly);
+			} else if (rPattern instanceof FromCompositeFactPattern) {
+				this.sourcePatternWidget = new FromCompositeFactPatternWidget(
+						this.getModeller(),
+						(FromCompositeFactPattern) rPattern, this.readOnly);
+			} else {
+				throw new IllegalArgumentException("Unsuported pattern "
+						+ rPattern + " for right side of FROM ACCUMULATE");
+			}
 
-            this.sourcePatternWidget.addOnModifiedCommand(new Command() {
-                public void execute() {
-                    setModified(true);
-                }
-            });
+			this.sourcePatternWidget.addOnModifiedCommand(new Command() {
+				public void execute() {
+					setModified(true);
+				}
+			});
 
-            panel.setWidget(r++,
-                    0,
-                    addRemoveButton(this.sourcePatternWidget, new ClickListener() {
+			panel.setWidget(
+					r++,
+					0,
+					addRemoveButton(this.sourcePatternWidget,
+							new ClickHandler() {
 
-                public void onClick(Widget sender) {
-                    if (Window.confirm(constants.RemoveThisBlockOfData())) {
-                        setModified(true);
-                        getFromAccumulatePattern().setSourcePattern(null);
-                        getModeller().refreshWidget();
-                    }
-                }
-            }));
-        }
+								public void onClick(ClickEvent event) {
+									if (Window.confirm(constants
+											.RemoveThisBlockOfData())) {
+										setModified(true);
+										getFromAccumulatePattern()
+												.setSourcePattern(null);
+										getModeller().refreshWidget();
+									}
 
+								}
+							}));
+		}
+
         TabPanel tPanel = new TabPanel();
 
         DirtyableFlexTable codeTable = new DirtyableFlexTable();
@@ -184,12 +203,11 @@
         functionPanel.add(functionTable);
         functionPanel.setDisabled(this.readOnly);
         tPanel.add(functionPanel);
-
-        ChangeListener changeListener = new ChangeListener() {
-
-            public void onChange(Widget sender) {
-
-                TextBox senderTB = (TextBox) sender;
+        ChangeHandler changehandler = new ChangeHandler() {
+			
+			public void onChange(ChangeEvent event) {
+				Widget sender = (Widget)event.getSource();
+                TextBox senderTB = (TextBox) event.getSource();
                 String code = senderTB.getText();
                 setModified(true);
                 if (sender == initField) {
@@ -217,13 +235,13 @@
                     getFromAccumulatePattern().setFunction(code);
                 }
             }
-        };
+		};
 
-        initField.addChangeListener(changeListener);
-        actionField.addChangeListener(changeListener);
-        reverseField.addChangeListener(changeListener);
-        resultField.addChangeListener(changeListener);
-        functionField.addChangeListener(changeListener);
+        initField.addChangeHandler(changehandler);
+        actionField.addChangeHandler(changehandler);
+        reverseField.addChangeHandler(changehandler);
+        resultField.addChangeHandler(changehandler);
+        functionField.addChangeHandler(changehandler);
 
 
         boolean useFunction = getFromAccumulatePattern().useFunctionOrCode().equals(FromAccumulateCompositeFactPattern.USE_FUNCTION);
@@ -264,17 +282,14 @@
         popup.setTitle(constants.NewFactPattern());
         popup.addAttribute(constants.chooseFactType(),
                 box);
-
-        box.addChangeListener(new ChangeListener() {
-
-            public void onChange(Widget w) {
+        box.addChangeHandler(new ChangeHandler() {
+			
+			public void onChange(ChangeEvent event) {
                 pattern.setFactPattern(new FactPattern(box.getItemText(box.getSelectedIndex())));
                 setModified(true);
                 getModeller().refreshWidget();
-                popup.hide();
-            }
-        });
-
+                popup.hide();			}
+		});
         popup.show();
     }
 
@@ -296,48 +311,46 @@
         popup.setTitle(constants.NewFactPattern());
         popup.addAttribute(constants.chooseFactType(),
                 box);
-
-        box.addChangeListener(new ChangeListener() {
-
-            public void onChange(Widget w) {
+        box.addChangeHandler(new ChangeHandler() {
+			
+			public void onChange(ChangeEvent event) {
                 getFromAccumulatePattern().setSourcePattern(new FactPattern(box.getItemText(box.getSelectedIndex())));
                 setModified(true);
                 getModeller().refreshWidget();
-                popup.hide();
-            }
-        });
+                popup.hide();			}
+		});
 
-
-
-
         final Button fromBtn = new Button(constants.From());
         final Button fromAccumulateBtn = new Button(constants.FromAccumulate());
         final Button fromCollectBtn = new Button(constants.FromCollect());
+		ClickHandler btnsClickHandler = new ClickHandler() {
 
-        ClickListener btnsClickListener = new ClickListener() {
+			public void onClick(ClickEvent event) {
+				Widget sender = (Widget) event.getSource();
+				if (sender == fromBtn) {
+					getFromAccumulatePattern().setSourcePattern(
+							new FromCompositeFactPattern());
+				} else if (sender == fromAccumulateBtn) {
+					getFromAccumulatePattern().setSourcePattern(
+							new FromAccumulateCompositeFactPattern());
+				} else if (sender == fromCollectBtn) {
+					getFromAccumulatePattern().setSourcePattern(
+							new FromCollectCompositeFactPattern());
+				} else {
+					throw new IllegalArgumentException("Unknown sender: "
+							+ sender);
+				}
 
-            public void onClick(Widget sender) {
+				setModified(true);
+				getModeller().refreshWidget();
+				popup.hide();
 
-                if (sender == fromBtn) {
-                    getFromAccumulatePattern().setSourcePattern(new FromCompositeFactPattern());
-                } else if (sender == fromAccumulateBtn) {
-                    getFromAccumulatePattern().setSourcePattern(new FromAccumulateCompositeFactPattern());
-                } else if (sender == fromCollectBtn) {
-                    getFromAccumulatePattern().setSourcePattern(new FromCollectCompositeFactPattern());
-                } else {
-                    throw new IllegalArgumentException("Unknown sender: " + sender);
-                }
+			}
+		};
 
-                setModified(true);
-                getModeller().refreshWidget();
-                popup.hide();
-            }
-        };
-
-        fromBtn.addClickListener(btnsClickListener);
-        fromAccumulateBtn.addClickListener(btnsClickListener);
-        fromCollectBtn.addClickListener(btnsClickListener);
-
+        fromBtn.addClickHandler(btnsClickHandler);
+        fromAccumulateBtn.addClickHandler(btnsClickHandler);
+        fromCollectBtn.addClickHandler(btnsClickHandler);
         popup.addAttribute("", fromBtn);
         popup.addAttribute("", fromAccumulateBtn);
         popup.addAttribute("", fromCollectBtn);

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-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -16,16 +16,9 @@
 
 package org.drools.guvnor.client.modeldriven.ui;
 
-import com.google.gwt.user.client.Command;
-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;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.Widget;
 import java.util.HashMap;
 import java.util.Map;
+
 import org.drools.guvnor.client.common.ClickableLabel;
 import org.drools.guvnor.client.common.DirtyableFlexTable;
 import org.drools.guvnor.client.common.FormStylePopup;
@@ -38,6 +31,17 @@
 import org.drools.ide.common.client.modeldriven.brl.FromCompositeFactPattern;
 import org.drools.ide.common.client.modeldriven.brl.IPattern;
 
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.Widget;
+
 /**
  *
  * @author esteban
@@ -65,22 +69,23 @@
 
     @Override
     protected Widget getCompositeLabel() {
+		ClickHandler  leftPatternclick = new ClickHandler() {
 
-        ClickListener leftPatternclick = new ClickListener() {
+			public void onClick(ClickEvent event) {
+				Widget w = (Widget) event.getSource();
+				showFactTypeSelector(w);
 
-            public void onClick(Widget w) {
-                showFactTypeSelector(w);
-            }
-        };
+			}
+		};
+		ClickHandler  rightPatternclick = new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget w = (Widget) event.getSource();
+				showRightPatternSelector(w);
+			}
+		};
 
-        ClickListener rightPatternclick = new ClickListener() {
 
-            public void onClick(Widget w) {
-                showRightPatternSelector(w);
-            }
-        };
-
-
         String lbl = "<div class='x-form-field'>" + HumanReadable.getCEDisplayName("from collect") + "</div>";
 
         DirtyableFlexTable panel = new DirtyableFlexTable();
@@ -120,18 +125,18 @@
                 }
             });
 
-            panel.setWidget(r++,
-                    0,
-                    addRemoveButton(patternWidget, new ClickListener() {
+			panel.setWidget(r++, 0,
+					addRemoveButton(patternWidget, new ClickHandler() {
 
-                public void onClick(Widget sender) {
-                    if (Window.confirm(constants.RemoveThisBlockOfData())) {
-                        setModified(true);
-                        getFromCollectPattern().setRightPattern(null);
-                        getModeller().refreshWidget();
-                    }
-                }
-            }));
+						public void onClick(ClickEvent event) {
+							if (Window.confirm(constants
+									.RemoveThisBlockOfData())) {
+								setModified(true);
+								getFromCollectPattern().setRightPattern(null);
+								getModeller().refreshWidget();
+							}
+						}
+					}));
         }
 
         return panel;
@@ -156,17 +161,17 @@
 //        box.addItem("TODO: Add Facts that extedns Collection");
 
         box.setSelectedIndex(0);
+		box.addChangeHandler(new ChangeHandler() {
+			public void onChange(ChangeEvent event) {
+				pattern.setFactPattern(new FactPattern(box.getValue(box
+						.getSelectedIndex())));
+				setModified(true);
+				getModeller().refreshWidget();
+				popup.hide();
+			}
+		});
 
-        box.addChangeListener(new ChangeListener() {
 
-            public void onChange(Widget w) {
-                pattern.setFactPattern(new FactPattern(box.getValue(box.getSelectedIndex())));
-                setModified(true);
-                getModeller().refreshWidget();
-                popup.hide();
-            }
-        });
-
         popup.addAttribute(constants.chooseFactType(),
                 box);
 
@@ -191,26 +196,29 @@
         popup.setTitle(constants.NewFactPattern());
         popup.addAttribute(constants.chooseFactType(),
                 box);
+		box.addChangeHandler(new ChangeHandler() {
 
-        box.addChangeListener(new ChangeListener() {
+			public void onChange(ChangeEvent event) {
+				getFromCollectPattern()
+						.setRightPattern(
+								new FactPattern(box.getItemText(box
+										.getSelectedIndex())));
+				setModified(true);
+				getModeller().refreshWidget();
+				popup.hide();
 
-            public void onChange(Widget w) {
-                getFromCollectPattern().setRightPattern(new FactPattern(box.getItemText(box.getSelectedIndex())));
-                setModified(true);
-                getModeller().refreshWidget();
-                popup.hide();
-            }
-        });
+			}
+		});
 
         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());
 
-        ClickListener btnsClickListener = new ClickListener() {
-
-            public void onClick(Widget sender) {
-
+        ClickHandler btnsClickHandler = new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget sender = (Widget)event.getSource();
                 if (sender == fromBtn) {
                     getFromCollectPattern().setRightPattern(new FromCompositeFactPattern());
                 } else if (sender == fromAccumulateBtn) {
@@ -225,13 +233,15 @@
                 setModified(true);
                 getModeller().refreshWidget();
                 popup.hide();
-            }
-        };
+				
+			}
+		};
+        
 
-        freeFormDRLBtn.addClickListener(btnsClickListener);
-        fromBtn.addClickListener(btnsClickListener);
-        fromAccumulateBtn.addClickListener(btnsClickListener);
-        fromCollectBtn.addClickListener(btnsClickListener);
+        freeFormDRLBtn.addClickHandler(btnsClickHandler);
+        fromBtn.addClickHandler(btnsClickHandler);
+        fromAccumulateBtn.addClickHandler(btnsClickHandler);
+        fromCollectBtn.addClickHandler(btnsClickHandler);
 
         popup.addAttribute("", freeFormDRLBtn);
         popup.addAttribute("", fromBtn);

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCompositeFactPatternWidget.java	2010-09-16 05:46:09 UTC (rev 35160)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCompositeFactPatternWidget.java	2010-09-16 08:23:26 UTC (rev 35161)
@@ -16,26 +16,29 @@
 
 package org.drools.guvnor.client.modeldriven.ui;
 
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.Widget;
 import org.drools.guvnor.client.common.ClickableLabel;
 import org.drools.guvnor.client.common.DirtyableFlexTable;
 import org.drools.guvnor.client.common.DirtyableHorizontalPane;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.ImageButton;
+import org.drools.guvnor.client.messages.Constants;
 import org.drools.guvnor.client.modeldriven.HumanReadable;
-import org.drools.guvnor.client.messages.Constants;
 import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.ide.common.client.modeldriven.brl.FactPattern;
 import org.drools.ide.common.client.modeldriven.brl.FromCompositeFactPattern;
 
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.ListBox;
+import com.google.gwt.user.client.ui.Widget;
+
 /**
  *
  * @author esteban
@@ -99,18 +102,34 @@
                             setModified(true);
                         }
                     });
-                    this.layout.setWidget(r,
-                            0,
-                            addRemoveButton(factPatternWidget, new ClickListener() {
+//                    this.layout.setWidget(r,
+//                            0,
+//                            addRemoveButton(factPatternWidget, new ClickListener() {
+//
+//                        public void onClick(Widget w) {
+//                            if (Window.confirm(constants.RemoveThisEntireConditionQ())) {
+//                                setModified(true);
+//                                pattern.setFactPattern(null);
+//                                getModeller().refreshWidget();
+//                            }
+//                        }
+//                    }));
+					this.layout.setWidget(
+							r,
+							0,
+							addRemoveButton(factPatternWidget,
+									new ClickHandler() {
 
-                        public void onClick(Widget w) {
-                            if (Window.confirm(constants.RemoveThisEntireConditionQ())) {
-                                setModified(true);
-                                pattern.setFactPattern(null);
-                                getModeller().refreshWidget();
-                            }
-                        }
-                    }));
+										public void onClick(ClickEvent event) {
+											if (Window.confirm(constants
+													.RemoveThisEntireConditionQ())) {
+												setModified(true);
+												pattern.setFactPattern(null);
+												getModeller().refreshWidget();
+											}
+
+										}
+									}));
                 }
                 r++;
             }
@@ -124,12 +143,14 @@
 
     protected Widget getCompositeLabel() {
 
-        ClickListener click = new ClickListener() {
-
-            public void onClick(Widget w) {
-                showFactTypeSelector(w);
-            }
-        };
+    	ClickHandler click = new ClickHandler() {
+			
+			public void onClick(ClickEvent event) {
+				Widget w = (Widget)event.getSource();
+				showFactTypeSelector(w);
+				
+			}
+		};
         String lbl = "<div class='x-form-field'>" + HumanReadable.getCEDisplayName("from") + "</div>";
 
         DirtyableFlexTable panel = new DirtyableFlexTable();
@@ -173,26 +194,27 @@
         popup.setTitle(constants.NewFactPattern());
         popup.addAttribute(constants.chooseFactType(),
                 box);
-
-        box.addChangeListener(new ChangeListener() {
-
-            public void onChange(Widget w) {
+        box.addChangeHandler(new ChangeHandler() {
+			
+			public void onChange(ChangeEvent event) {
                 pattern.setFactPattern(new FactPattern(box.getItemText(box.getSelectedIndex())));
                 setModified(true);
                 getModeller().refreshWidget();
                 popup.hide();
-            }
-        });
+			}
+		});
 
+
         popup.show();
     }
 
-    protected Widget addRemoveButton(Widget w, ClickListener listener) {
+    protected Widget addRemoveButton(Widget w, ClickHandler listener) {
         DirtyableHorizontalPane horiz = new DirtyableHorizontalPane();
 
         final Image remove = new ImageButton("images/delete_item_small.gif"); //NON-NLS
         remove.setTitle(constants.RemoveThisBlockOfData());
-        remove.addClickListener(listener);
+        remove.addClickHandler(listener);
+        //remove.addClickListener(listener);
 
 
         horiz.setWidth("100%");



More information about the jboss-svn-commits mailing list