[jboss-svn-commits] JBL Code SVN: r8788 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: public and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2007-01-10 07:06:42 -0500 (Wed, 10 Jan 2007)
New Revision: 8788

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/public/JBRMS.css
Log:
some cosmetic changes for alignment

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	2007-01-10 10:10:06 UTC (rev 8787)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java	2007-01-10 12:06:42 UTC (rev 8788)
@@ -157,7 +157,9 @@
                 w.setStyleName( "model-builderInner-Background" );
             }
             
-            vert.add( spacerWidget() );
+            //w.setWidth( "100%" );            
+            vert.add( spacerWidget() );            
+            //vert.setWidth( "100%" );
             
             HorizontalPanel horiz = new HorizontalPanel();
             
@@ -177,9 +179,12 @@
                 }
             } );
             horiz.add( w );
+            if (!(w instanceof ActionRetractFactWidget)) {
+                w.setWidth( "100%" );
+                horiz.setWidth( "100%" );
+            }
+            
             horiz.add( remove );
-            
-            
             vert.add( horiz );
             
         }
@@ -408,13 +413,13 @@
             Widget w = null;
             if (pattern instanceof FactPattern) {                  
                 w = new FactPatternWidget(this, pattern, completions, true) ;
-                vert.add( addLhsWidget( model,
+                vert.add( wrapLHSWidget( model,
                               i,
                               w ) );
                 vert.add( spacerWidget() );
             } else if (pattern instanceof CompositeFactPattern) {
                 w = new CompositeFactPatternWidget(this, (CompositeFactPattern) pattern, completions) ;
-                vert.add( addLhsWidget( model, i, w ));
+                vert.add( wrapLHSWidget( model, i, w ));
                 vert.add( spacerWidget() );
             } else if (pattern instanceof DSLSentence) {
                 //ignore this time                
@@ -434,14 +439,14 @@
             if (pattern instanceof DSLSentence) {
                 w = new DSLSentenceWidget((DSLSentence) pattern);
 
-                dsls.add( addLhsWidget( model, i, w ) );
+                dsls.add( wrapLHSWidget( model, i, w ) );
                 dsls.setStyleName( "model-builderInner-Background" );
             }
         }
         vert.add( dsls );
+
         
         
-        
         return vert;
     }
 
@@ -452,9 +457,9 @@
     }
 
     /**
-     * This adds the widget to the UI, also adding the  
+     * This adds the widget to the UI, also adding the remove icon.
      */
-    private Widget addLhsWidget(final RuleModel model,
+    private Widget wrapLHSWidget(final RuleModel model,
                               int i,
                               Widget w) {
         HorizontalPanel horiz = new HorizontalPanel();
@@ -481,12 +486,15 @@
         } );
         
 
+        horiz.setWidth( "100%" );
+        w.setWidth( "100%" );
+        
         horiz.add( w );
         horiz.add( remove );
 
         return horiz;
 
-        //vert.add( horiz );
+
     }
 
 

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	2007-01-10 10:10:06 UTC (rev 8787)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2007-01-10 12:06:42 UTC (rev 8788)
@@ -121,8 +121,7 @@
 .model-builderInner-Background {
 	background-color: white;
 	border: 1px solid #B8B8B8;
-	//border-top: 1px solid gray;
-	//border-bottom: 1px solid gray;
+
 }
 
 .model-builderInnerInner-Background {