[jboss-svn-commits] JBL Code SVN: r32912 - 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-05-17 13:20:53 -0400 (Mon, 17 May 2010)
New Revision: 32912

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
Log:
GUVNOR-543: Expression Builder Widget's combobox disappears
	- Adding support for ExpressionFieldVariable: Rigth now, no methods/attributes are set in the combobox for this type. But at least you can use Field variables now.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java	2010-05-17 17:17:52 UTC (rev 32911)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java	2010-05-17 17:20:53 UTC (rev 32912)
@@ -38,6 +38,7 @@
 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.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.ListBox;
@@ -390,6 +391,7 @@
     private Panel widgets(Widget left,
             Widget right) {
         HorizontalPanel panel = new HorizontalPanel();
+        panel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
         panel.add(left);
         panel.add(right);
         panel.setWidth("100%");

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java	2010-05-17 17:17:52 UTC (rev 32911)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java	2010-05-17 17:20:53 UTC (rev 32912)
@@ -9,10 +9,10 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.ChangeListener;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
-import com.gwtext.client.widgets.form.Label;
 import org.drools.guvnor.client.common.SmallLabel;
 import org.drools.ide.common.client.modeldriven.MethodInfo;
 import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
@@ -58,18 +58,20 @@
             this.readOnly = readOnly;
         }
 
+        panel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
+
         this.expression = expression;
         if (expression == null || expression.getText().length() == 0) {
             if (this.readOnly) {
-                panel.add(new SmallLabel("<b>-</b"));
+                panel.add(new SmallLabel("<b>-</b>"));
             } else {
                 panel.add(createStartPointWidget());
             }
         } else {
             if (this.readOnly) {
-                panel.add(new SmallLabel("<b>" + expression.getText() + "</b"));
+                panel.add(new SmallLabel("<b>" + expression.getText() + "</b>"));
             } else {
-                panel.add(new SmallLabel("<b>" + expression.getText() + ".</b"));
+                panel.add(new SmallLabel("<b>" + expression.getText() + ".</b>"));
                 panel.add(getWidgetForCurrentType());
             }
         }
@@ -135,7 +137,7 @@
         w = getWidgetForCurrentType();
 
         if (!expression.isEmpty()) {
-            panel.add(new Label(expression.getText()));
+            panel.add(new SmallLabel("<b>"+expression.getText()+".</b>"));
         }
         if (w != null) {
             panel.add(w);
@@ -265,7 +267,7 @@
 
         panel.clear();
         if (!expression.isEmpty()) {
-            panel.add(new Label(expression.getText()));
+            panel.add(new SmallLabel("<b>"+expression.getText()+".</b>"));
         }
         if (w != null) {
             panel.add(w);