[jboss-svn-commits] JBL Code SVN: r8754 - labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui

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

Author: michael.neale at jboss.com
Date: 2007-01-07 15:00:51 -0500 (Sun, 07 Jan 2007)
New Revision: 8754

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
Log:
costmetic changes

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java	2007-01-07 19:56:06 UTC (rev 8753)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java	2007-01-07 20:00:51 UTC (rev 8754)
@@ -106,9 +106,9 @@
                 showAddFieldPopup(w);
             }
         } );
-        
+                
+        horiz.add( new Label(completions.getActionDisplayName("assert") + " " + this.model.factType) );
         horiz.add( edit );
-        horiz.add( new Label(completions.getActionDisplayName("assert") + " " + this.model.factType) );
         return horiz;
         
     }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java	2007-01-07 19:56:06 UTC (rev 8753)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java	2007-01-07 20:00:51 UTC (rev 8754)
@@ -105,8 +105,9 @@
             }
         } );
         
+        
+        horiz.add( new Label(completions.getActionDisplayName("set") + " [" + model.variable + "]") );
         horiz.add( edit );
-        horiz.add( new Label(completions.getActionDisplayName("set") + " [" + model.variable + "]") );
         
         return horiz;
     }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java	2007-01-07 19:56:06 UTC (rev 8753)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java	2007-01-07 20:00:51 UTC (rev 8754)
@@ -74,9 +74,9 @@
                 showFactTypeSelector( w );
             }
         } );
-
+        
+        horiz.add( new Label( completions.getCEDisplayName( pattern.type ) ) );
         horiz.add( edit );
-        horiz.add( new Label( completions.getCEDisplayName( pattern.type ) ) );
         return horiz;
     }
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java	2007-01-07 19:56:06 UTC (rev 8753)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java	2007-01-07 20:00:51 UTC (rev 8754)
@@ -50,7 +50,7 @@
             final Constraint c = pattern.constraints[row];
             final int currentRow = row;
 
-            inner.setWidget( row, 0, fieldDropDown(c));/*, new Command() {
+            inner.setWidget( row, 0, fieldLabel(c));/*, new Command() {
                 public void execute() {
                     inner.setWidget( currentRow, 1, operatorDropDown( c ));
                 }                
@@ -108,7 +108,7 @@
         
         Image edit = new Image("images/add_field_to_fact.gif");
         edit.setTitle( "Add a field to this condition, or bind a varible to this fact." );
-        horiz.add( edit );
+        
         edit.addClickListener( new ClickListener() {
             public void onClick(Widget w) {
                 showPatternPopup(w);
@@ -120,6 +120,7 @@
         } else {
             horiz.add( new Label(pattern.factType));
         }
+        horiz.add( edit );
         
         return horiz;
         
@@ -277,7 +278,7 @@
     }
 
 
-    private Widget fieldDropDown(final Constraint con) {//, final Command onChange) {
+    private Widget fieldLabel(final Constraint con) {//, final Command onChange) {
         return new Label(con.fieldName);
     }