[jboss-svn-commits] JBL Code SVN: r18462 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: client/modeldriven/ui and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Feb 11 21:52:50 EST 2008


Author: michael.neale at jboss.com
Date: 2008-02-11 21:52:50 -0500 (Mon, 11 Feb 2008)
New Revision: 18462

Removed:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/Lbl.java
Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStyleLayout.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/InfoPopup.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/SmallLabel.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionInsertFactWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.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/ActionValueEditor.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/ConstraintValueEditor.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java
   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/RuleModeller.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
Log:
tidy up

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStyleLayout.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStyleLayout.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/FormStyleLayout.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -63,7 +63,7 @@
      */
     public void addAttribute(String lbl,
                              Widget editor) {
-        HTML label = new HTML("<small>" + lbl + "</small>");
+        HTML label = new HTML("<div class='x-form-field'>" + lbl + "</div>");
         layout.setWidget( numInLayout, 0, label );
         formatter.setAlignment( numInLayout, 0, HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_TOP );
         layout.setWidget( numInLayout, 1, editor );
@@ -84,7 +84,7 @@
      * Adds a header at the top.
      */
     protected void addHeader(String image, String title) {
-        HTML name = new HTML("<small><b>" + title + "</b></small>");
+        HTML name = new HTML("<div class='x-form-field'><b>" + title + "</b></div>");
         name.setStyleName( "resource-name-Label" );
         doHeader( image, name );
     }
@@ -99,7 +99,7 @@
 
 
     protected void addHeader(String image, String title, Widget titleIcon) {
-    	HTML name = new HTML("<small><b>" + title + "</b></small>");
+    	HTML name = new HTML("<div class='x-form-field'><b>" + title + "</b></div>");
         name.setStyleName( "resource-name-Label" );
         HorizontalPanel horiz = new HorizontalPanel();
         horiz.add( name );

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/InfoPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/InfoPopup.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/InfoPopup.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -36,7 +36,7 @@
         info.addClickListener( new ClickListener() {
             public void onClick(Widget w) {
                 final FormStylePopup pop = new FormStylePopup("images/information.gif", title);
-                pop.addRow( new Lbl(message, "small-Text") );
+                pop.addRow( new SmallLabel(message) );
 
                 pop.show();
             }

Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/Lbl.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/Lbl.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/Lbl.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -1,33 +0,0 @@
-package org.drools.brms.client.common;
-/*
- * Copyright 2005 JBoss Inc
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-import com.google.gwt.user.client.ui.Label;
-
-/**
- * Little helper class to decorate vanilla labels with style.
- * 
- * @author Michael Neale
- */
-public class Lbl extends Label {
-    
-    public Lbl(String label, String style) {
-        super(label);
-        super.setStyleName( style );
-    }
-}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/SmallLabel.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/SmallLabel.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/SmallLabel.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -5,7 +5,8 @@
 public class SmallLabel extends HTML {
 
 	public SmallLabel(String text) {
-		super("<small>" + text + "</small>");
+		//super("<small>" + text + "</small>");
+		super("<div class='x-form-field'>" + text + "</div>");
 	}
 
 	public SmallLabel() {
@@ -13,7 +14,8 @@
 	}
 
 	public void setText(String t) {
-		setHTML("<small>" + t + "</small>");
+		//setHTML("<small>" + t + "</small>");
+		setHTML("<div class='x-form-field'>" + t + "</div>");
 	}
 
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionInsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionInsertFactWidget.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionInsertFactWidget.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -21,7 +21,7 @@
 import org.drools.brms.client.common.DirtyableFlexTable;
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.Lbl;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.common.YesNoDialog;
 import org.drools.brms.client.modeldriven.HumanReadable;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
@@ -34,7 +34,6 @@
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -108,7 +107,7 @@
     }
 
     private Widget fieldSelector(final ActionFieldValue val) {
-        return new Label(val.field);
+        return new SmallLabel(val.field);
     }
 
     private Widget getAssertLabel() {
@@ -128,7 +127,7 @@
         if (this.model instanceof ActionInsertLogicalFact) {
             assertType = "assertLogical";
         }
-        horiz.add( new Lbl(HumanReadable.getActionDisplayName(assertType) + " " + this.model.factType, "modeller-action-Label") );
+        horiz.add( new SmallLabel("<i>" + HumanReadable.getActionDisplayName(assertType) + " " + this.model.factType + "</i>") );
         horiz.add( edit );
         return horiz;
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -1,13 +1,13 @@
 package org.drools.brms.client.modeldriven.ui;
 /*
  * Copyright 2005 JBoss Inc
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,7 @@
 
 
 
-import org.drools.brms.client.common.Lbl;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.modeldriven.HumanReadable;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
@@ -26,7 +26,7 @@
 import com.google.gwt.user.client.ui.FlexTable;
 
 /**
- * This is used when you want to retract a fact. It will provide a list of 
+ * This is used when you want to retract a fact. It will provide a list of
  * bound facts for you to retract.
  * @author Michael Neale
  */
@@ -34,18 +34,18 @@
 
     private FlexTable layout;
 
-    
+
     public ActionRetractFactWidget(SuggestionCompletionEngine com, ActionRetractFact model) {
         layout = new FlexTable();
-        
+
         layout.setStyleName( "model-builderInner-Background" );
-        
-        layout.setWidget( 0, 0, new Lbl(HumanReadable.getActionDisplayName( "retract" ), "modeller-action-Label") );
-        layout.setWidget( 0, 1, new Lbl( "[" + model.variableName + "]", "modeller-action-Label") );
-        
+
+        layout.setWidget( 0, 0, new SmallLabel("<i>" + HumanReadable.getActionDisplayName( "retract" ) + "</i>")  );
+        layout.setWidget( 0, 1, new SmallLabel("<i>" + "[" + model.variableName + "]" + "</i>") );
+
         initWidget( layout );
     }
 
-    
-    
+
+
 }
\ No newline at end of file

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	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -21,7 +21,7 @@
 import org.drools.brms.client.common.DirtyableFlexTable;
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.ImageButton;
-import org.drools.brms.client.common.Lbl;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.common.YesNoDialog;
 import org.drools.brms.client.modeldriven.HumanReadable;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
@@ -35,7 +35,6 @@
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.Widget;
 
@@ -129,7 +128,7 @@
         if (this.model instanceof ActionUpdateField) {
             modifyType = "modify";
         }
-        horiz.add( new Lbl(HumanReadable.getActionDisplayName(modifyType) + " [" + model.variable + "]", "modeller-action-Label") );
+        horiz.add( new SmallLabel("<i>" + HumanReadable.getActionDisplayName(modifyType) + " [" + model.variable + "]</i>" )) ;
         horiz.add( edit );
 
         return horiz;
@@ -184,7 +183,7 @@
 
 
     private Widget fieldSelector(final ActionFieldValue val) {
-        return new Label(val.field);
+        return new SmallLabel(val.field);
     }
 
     /**

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionValueEditor.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionValueEditor.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -4,7 +4,7 @@
 import org.drools.brms.client.common.FieldEditListener;
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.Lbl;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.common.ValueChanged;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
@@ -159,8 +159,7 @@
         form.addAttribute( "Literal value:", widgets( lit, new InfoPopup( "Literal",
                                                                           "A literal value means the " + "constraint is directly against the value that you type (ie. what you see on screen)." ) ) );
         form.addRow( new HTML( "<hr/>" ) );
-        form.addRow( new Lbl( "Advanced",
-                              "weak-Text" ) );
+        form.addRow( new SmallLabel( "<i>Advanced</i>" ) );
 
         Button formula = new Button("Formula");
         formula.addClickListener(new ClickListener() {

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	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/CompositeFactPatternWidget.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -22,6 +22,7 @@
 import org.drools.brms.client.common.DirtyableVerticalPane;
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.ImageButton;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.modeldriven.HumanReadable;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
@@ -29,13 +30,9 @@
 
 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.Grid;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
 /**
@@ -97,7 +94,7 @@
             }
         } );
 
-        horiz.add( new Label( HumanReadable.getCEDisplayName( pattern.type ) ) );
+        horiz.add( new SmallLabel( HumanReadable.getCEDisplayName( pattern.type ) ) );
         horiz.add( edit );
         horiz.setStyleName( "modeller-composite-Label" );
         return horiz;

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ConstraintValueEditor.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -23,7 +23,7 @@
 import org.drools.brms.client.common.FieldEditListener;
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.Lbl;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.common.ValueChanged;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brl.FactPattern;
@@ -313,8 +313,7 @@
 
 
         form.addRow( new HTML( "<hr/>" ) );
-        form.addRow( new Lbl( "Advanced options",
-                              "weak-Text" ) );
+        form.addRow( new SmallLabel( "<i>Advanced options:</i>" ) );
 
         //only want to show variables if we have some !
         if (this.model.getBoundVariablesInScope( this.constraint ).size() > 0) {

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -1,13 +1,13 @@
 package org.drools.brms.client.modeldriven.ui;
 /*
  * Copyright 2005 JBoss Inc
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,7 @@
 
 import org.drools.brms.client.common.DirtyableComposite;
 import org.drools.brms.client.common.DirtyableHorizontalPane;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.modeldriven.brl.DSLSentence;
 
 import com.google.gwt.user.client.ui.ChangeListener;
@@ -54,8 +55,8 @@
         initWidget( this.horiz );
     }
 
-    
-    /** 
+
+    /**
      * This will take a DSL line item, and split it into widget thingamies for displaying.
      * One day, if this is too complex, this will have to be done on the server side.
      */
@@ -68,15 +69,15 @@
             char c = chars[i];
             if (c == '{') {
                 currentLabel = null;
-                currentBox = new FieldEditor(); 
+                currentBox = new FieldEditor();
                 addWidget( currentBox );
-                
+
             } else if (c == '}') {
                 currentBox.setVisibleLength( currentBox.getText().length() + 1);
                 currentBox = null;
             } else {
                 if (currentBox == null && currentLabel == null) {
-                    currentLabel = new Label();
+                    currentLabel = new SmallLabel();
                     addWidget( currentLabel );
                 }
                 if (currentLabel != null) {
@@ -84,18 +85,18 @@
                 } else if (currentBox != null) {
                     currentBox.setText( currentBox.getText() + c );
                 }
-                
+
             }
         }
-        
+
     }
 
     private void addWidget(Widget currentBox) {
         this.horiz.add( currentBox );
         widgets.add( currentBox );
-    }    
-    
-    
+    }
+
+
     /**
      * This will go through the widgets and build up a sentence.
      */
@@ -110,52 +111,52 @@
             }
         }
         this.sentence.sentence = newSentence.trim();
-        
-    }    
-    
+
+    }
+
     class FieldEditor extends DirtyableComposite {
 
         private TextBox box;
         private HorizontalPanel panel = new HorizontalPanel();
-        
+
         public FieldEditor() {
             box = new TextBox();
             //box.setStyleName( "dsl-field-TextBox" );
-            
+
             panel.add( new HTML("&nbsp;") );
             panel.add( box );
             panel.add( new HTML("&nbsp;") );
-            
+
             box.addChangeListener( new ChangeListener() {
                 public void onChange(Widget w) {
                     updateSentence();
                     makeDirty();
-                }                
+                }
             });
-            
+
             initWidget( panel );
         }
-        
-        
 
 
 
+
+
         public void setText(String t) {
             box.setText( t );
         }
-        
+
         public void setVisibleLength(int l) {
             box.setVisibleLength( l );
         }
-        
+
         public String getText() {
             return box.getText();
         }
-    }    
-    
+    }
+
     public boolean isDirty() {
         return horiz.hasDirty();
     }
-    
-    
+
+
 }
\ No newline at end of file

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	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -23,7 +23,7 @@
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.ImageButton;
 import org.drools.brms.client.common.InfoPopup;
-import org.drools.brms.client.common.Lbl;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.modeldriven.HumanReadable;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
@@ -44,7 +44,6 @@
 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.Label;
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.TextBox;
 import com.google.gwt.user.client.ui.Widget;
@@ -253,9 +252,9 @@
         } );
 
         if ( pattern.boundName != null ) {
-            horiz.add( new Label( "[" + pattern.boundName + "] " + pattern.factType  ) );
+            horiz.add( new SmallLabel( "[" + pattern.boundName + "] " + pattern.factType  ) );
         } else {
-            horiz.add( new Label( pattern.factType ) );
+            horiz.add( new SmallLabel( pattern.factType ) );
         }
         horiz.add( edit );
 
@@ -370,7 +369,7 @@
 
         //popup.addRow( new HTML("<hr/>") );
 
-        popup.addRow( new Lbl("Advanced options", "weak-Text") );
+        popup.addRow( new SmallLabel("<i>Advanced options:</i>") );
         final Button predicate = new Button( "New formula" );
         predicate.addClickListener( new ClickListener() {
             public void onClick(Widget w) {
@@ -518,10 +517,10 @@
                 ab.add( bind );
             }
         } else {
-            ab.add( new Label("[" + con.fieldBinding + "]") );
+            ab.add( new SmallLabel("[" + con.fieldBinding + "]") );
         }
 
-        ab.add(new Label( con.fieldName ));
+        ab.add(new SmallLabel( con.fieldName ));
         return ab;
     }
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java	2008-02-12 02:52:50 UTC (rev 18462)
@@ -27,6 +27,7 @@
 import org.drools.brms.client.common.ErrorPopup;
 import org.drools.brms.client.common.FormStylePopup;
 import org.drools.brms.client.common.ImageButton;
+import org.drools.brms.client.common.SmallLabel;
 import org.drools.brms.client.common.YesNoDialog;
 import org.drools.brms.client.modeldriven.HumanReadable;
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
@@ -97,11 +98,11 @@
             }
         });
 
-        layout.setWidget( 0, 0, new Label("WHEN") );
+        layout.setWidget( 0, 0, new SmallLabel("WHEN") );
         layout.setWidget( 0, 2, addPattern );
 
         layout.setWidget( 1, 1, renderLhs(this.model) );
-        layout.setWidget( 2, 0, new Label("THEN") );
+        layout.setWidget( 2, 0, new SmallLabel("THEN") );
 
         Image addAction = new ImageButton("images/new_item.gif");
         addAction.setTitle( "Add an action to this rule." );
@@ -114,7 +115,7 @@
 
         layout.setWidget( 3, 1, renderRhs(this.model) );
 
-        layout.setWidget( 4, 0, new Label("(options)") );
+        layout.setWidget( 4, 0, new SmallLabel("(options)") );
         layout.setWidget( 4, 2, getAddAttribute() );
         layout.setWidget( 5, 1, new RuleAttributeWidget(this, this.model) );
     }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2008-02-11 23:15:19 UTC (rev 18461)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2008-02-12 02:52:50 UTC (rev 18462)
@@ -99,12 +99,12 @@
 	padding:1px 4px;
 }
 .model-builder-Background {
-	-moz-border-radius:.7em;
-	-webkit-border-radius:.7em;
-	-khtml-border-radius:.7em;
-	border-radius:.7em;
+	#-moz-border-radius:.7em;
+	#-webkit-border-radius:.7em;
+	#-khtml-border-radius:.7em;
+	#border-radius:.7em;
 	padding-left:.5em;
-	border:1px solid #ddd;
+	#border:1px solid #ddd;
 	background:#FFF;
 }
 .model-builderInner-Background {
@@ -185,10 +185,7 @@
 	border:1px solid #aa9;
 	padding:0;
 }
-.weak-Text {
-	font-size:smaller;
-	color:#ccc;
-}
+
 .gwt-Tree .gwt-TreeItem-selected {
 	background:#FF0;
 }




More information about the jboss-svn-commits mailing list