[jboss-svn-commits] JBL Code SVN: r31361 - 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-02 10:22:46 -0500 (Tue, 02 Feb 2010)
New Revision: 31361

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
Log:
Guided Editor:
	Activating the row action bar buttons in Rule Editor created a bug with comboboxes. Fixed.

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-02-02 14:10:16 UTC (rev 31360)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/RuleModeller.java	2010-02-02 15:22:46 UTC (rev 31361)
@@ -364,10 +364,8 @@
             layout.getFlexCellFormatter().setHorizontalAlignment(currentLayoutRow, 0, HasHorizontalAlignment.ALIGN_CENTER);
             layout.getFlexCellFormatter().setVerticalAlignment(currentLayoutRow, 0, HasVerticalAlignment.ALIGN_MIDDLE);
 
-            //we need a FocusPanel in order to be able to capture mouse events.
-            FocusPanel parent = new FocusPanel(widget);
 
-            layout.setWidget(currentLayoutRow, 1, parent);
+            layout.setWidget(currentLayoutRow, 1, widget);
             layout.getFlexCellFormatter().setHorizontalAlignment(currentLayoutRow, 1, HasHorizontalAlignment.ALIGN_LEFT);
             layout.getFlexCellFormatter().setVerticalAlignment(currentLayoutRow, 1, HasVerticalAlignment.ALIGN_TOP);
 
@@ -955,14 +953,12 @@
             vert.add(wrapLHSWidget(model, i, w));
             vert.add(spacerWidget());
 
-            //we need a FocusPanel in order to be able to capture mouse events.
-            FocusPanel parent = new FocusPanel(vert);
 
             layout.setHTML(currentLayoutRow, 0, "<div class='x-form-field'>" + (i + 1) + ".</div>");
             layout.getFlexCellFormatter().setHorizontalAlignment(currentLayoutRow, 0, HasHorizontalAlignment.ALIGN_CENTER);
             layout.getFlexCellFormatter().setVerticalAlignment(currentLayoutRow, 0, HasVerticalAlignment.ALIGN_MIDDLE);
 
-            layout.setWidget(currentLayoutRow, 1, parent);
+            layout.setWidget(currentLayoutRow, 1, vert);
             layout.getFlexCellFormatter().setHorizontalAlignment(currentLayoutRow, 1, HasHorizontalAlignment.ALIGN_LEFT);
             layout.getFlexCellFormatter().setVerticalAlignment(currentLayoutRow, 1, HasVerticalAlignment.ALIGN_TOP);
 
@@ -1079,11 +1075,6 @@
 
 
         actionPanel.addMouseListener(mouseListenerAdapter);
-        
-        Widget widget = layout.getWidget(currentLayoutRow, 1);
-        if (widget instanceof FocusPanel){
-            ((FocusPanel)widget).addMouseListener(mouseListenerAdapter);
-        }
 
         layout.setWidget(currentLayoutRow, 2, actionPanel);
         layout.getFlexCellFormatter().setHorizontalAlignment(currentLayoutRow, 2, HasHorizontalAlignment.ALIGN_CENTER);