[jboss-svn-commits] JBL Code SVN: r6193 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client main/java/org/drools/brms/client/breditor main/java/org/drools/brms/public test/java/org/drools/brms

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Sep 13 05:36:57 EDT 2006


Author: michael.neale at jboss.com
Date: 2006-09-13 05:36:49 -0400 (Wed, 13 Sep 2006)
New Revision: 6193

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/BREditor.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/EditableLine.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/AppTest.java
Log:
refactoring, some style changes, more work on BR editor

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java	2006-09-13 09:15:29 UTC (rev 6192)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java	2006-09-13 09:36:49 UTC (rev 6193)
@@ -21,13 +21,15 @@
 import org.drools.brms.client.JBRMSFeature.ComponentInfo;
 
 import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Hyperlink;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
 /**
- * The left panel that contains all of the sinks, along with a short description
+ * This is the list of features that make up the rule management console.
+ * Refer to the JBRMSFeatureConfigurator which actually sets up the individual features.
+ * 
+ * This is the left panel that contains all of the features, along with a short description
  * of each.
  */
 public class JBRMSFeatureList extends Composite {
@@ -37,7 +39,7 @@
   private int selectedSink = -1;
 
   public JBRMSFeatureList() {
-    setWidget(list);
+    initWidget(list);
     setStyleName("ks-List");
   }
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java	2006-09-13 09:15:29 UTC (rev 6192)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Packages.java	2006-09-13 09:36:49 UTC (rev 6193)
@@ -81,8 +81,6 @@
         panel.add( new BREditor() );
         
         EditableLine line = new EditableLine();
-        line.makeEditable();
-        line.makeReadOnly();
         panel.add( line );
         
         panel.setSpacing( 8 );

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/BREditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/BREditor.java	2006-09-13 09:15:29 UTC (rev 6192)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/BREditor.java	2006-09-13 09:36:49 UTC (rev 6193)
@@ -12,6 +12,9 @@
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 
+/**
+ * This is the editor for "business" rules via a DSL.
+ */
 public class BREditor extends Composite {
 
     final int DESC_COLUMN = 0;
@@ -31,6 +34,8 @@
         initData();
         populateTable();
         
+        
+        
         initWidget( panel );
     }
 
@@ -63,6 +68,7 @@
         
         table.setWidget( 0, ACTION_COLUMN, addLhs );
         
+        
         int rowOffset = 1;
         
         //setup LHS
@@ -80,13 +86,8 @@
         
         //setup RHS
         populateContent( rowOffset, rhs );
-        
-//        //setup RHS
-//        for ( int i = 0; i < rhs.size(); i++ ) {
-//            Widget w = (Widget) rhs.get( 0 );
-//            table.setWidget( i+rowOffset, CONTENT_COLUMN, w );
-//        }
 
+
     }
 
     private void populateContent(int rowOffset, final List dataList) {
@@ -94,7 +95,7 @@
         for ( int i = 0; i < dataList.size(); i++ ) {
             Widget w = (Widget) dataList.get( i );
             int row = i + rowOffset;
-            table.setWidget( row, CONTENT_COLUMN, w );
+            table.setWidget( row, CONTENT_COLUMN, w );            
             Button removeButton = new Button("-");
             final int idx = i;
             removeButton.addClickListener( new ClickListener() {
@@ -117,10 +118,12 @@
         
         //now add the new
         table = new FlexTable();
+        table.setStyleName( "rule-breditor-Table" );
         panel.add( table );
     }
 
     private void initData() {
+        
         lhs.add( new Label("Hello this is {foo}"));
         lhs.add( new Label("Hello this is {foo}"));
         rhs.add(new Label("panic all is lost") );

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/EditableLine.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/EditableLine.java	2006-09-13 09:15:29 UTC (rev 6192)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/EditableLine.java	2006-09-13 09:36:49 UTC (rev 6193)
@@ -4,6 +4,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
@@ -12,20 +14,49 @@
 import com.google.gwt.user.client.ui.Widget;
 
 public class EditableLine extends Composite {
-
+    
+    /** The main panel of the composite */
     private Panel panel;
+    
+    /** This is the list of widgets that are used to display/capture data 
+     * Should be Label, TextBox or Button (for editing mode)
+     */
     private List widgets = new ArrayList();
     
+    /**
+     * Obviously to keep state of the widget when switching modes.
+     */
+    private boolean readOnly = true;
     
     public EditableLine() {
+        initData();
+        
+        panel = new HorizontalPanel();
+        initWidget( panel ); 
+        makeReadOnly();
+    }
+
+    private void initData() {
         widgets.add( new Label("The persons name is ") );
         TextBox box = new TextBox();
-        box.setVisibleLength( 4 );
-        
+        box.setVisibleLength( 4 );        
         widgets.add( box );
         
-        panel = new HorizontalPanel();
-        initWidget( panel );        
+        Button edit = new Button(".");
+        edit.addClickListener( new ClickListener() {
+
+            public void onClick(Widget w) {
+                if (readOnly) {
+                    readOnly = false;
+                    makeEditable();
+                } else {
+                    readOnly = true;
+                    makeReadOnly();
+                }
+            }
+            
+        });
+        widgets.add( edit );
     }
     
     public void makeReadOnly() {
@@ -37,6 +68,8 @@
             } else if (element instanceof TextBox) {
                 TextBox box = (TextBox) element;
                 panel.add( new Label(box.getText()) );
+            } else {
+                panel.add( element );
             }
         }
     }

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	2006-09-13 09:15:29 UTC (rev 6192)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2006-09-13 09:36:49 UTC (rev 6193)
@@ -32,13 +32,13 @@
 }
 
 .gwt-DialogBox {
-  sborder: 8px solid #C3D9FF;
+  sborder: 8px solid #B8B8B8;
   border: 2px outset;
   background-color: white;
 }
 
 .gwt-DialogBox .Caption {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   padding: 3px;
   margin: 2px;
   font-weight: bold;
@@ -53,12 +53,12 @@
 
 .gwt-HorizontalSplitter .Bar {
   width: 8px;
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .gwt-VerticalSplitter .Bar {
   height: 8px;
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .gwt-HTML {
@@ -79,7 +79,7 @@
 }
 
 .gwt-MenuBar {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   border: 1px solid #87B3FF;
   cursor: default;
 }
@@ -91,7 +91,7 @@
 }
 
 .gwt-MenuBar .gwt-MenuItem-selected {
-  background-color: #E8EEF7;
+  background-color: #F6F9ED;
 }
 
 .gwt-PasswordTextBox {
@@ -109,7 +109,7 @@
 }
 
 .gwt-TabBar {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   font-size: smaller;
 }
 
@@ -125,7 +125,7 @@
 }
 
 .gwt-TabBar .gwt-TabBarItem {
-  border-top: 1px solid #C3D9FF;
+  border-top: 1px solid #B8B8B8;
   border-bottom: 1px solid #87B3FF;
   padding: 2px;
   cursor: pointer;
@@ -134,11 +134,11 @@
 
 .gwt-TabBar .gwt-TabBarItem-selected {
   font-weight: bold;
-  background-color: #E8EEF7;
+  background-color: #F6F9ED;
   border-top: 1px solid #87B3FF;
   border-left: 1px solid #87B3FF;
   border-right: 1px solid #87B3FF;
-  border-bottom: 1px solid #E8EEF7;
+  border-bottom: 1px solid #F6F9ED;
   padding: 2px;
   cursor: default;
 }
@@ -157,14 +157,14 @@
 }
 
 .gwt-Tree .gwt-TreeItem-selected {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .gwt-StackPanel {
 }
 
 .gwt-StackPanel .gwt-StackPanelItem {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   cursor: pointer;
   cursor: hand;
 }
@@ -173,15 +173,18 @@
 }
 
 /* -------------------------------------------------------------------------- */
+
+/* -- orig border: #C3D9FF  replaced with #B8B8B8 
+  orig background: #E8EEF7 replaced with #F6F9ED -- */
 .ks-Sink {
-  border: 8px solid #C3D9FF;
-  background-color: #E8EEF7;
+  border: 8px solid #B8B8B8;
+  background-color: #F6F9ED;
   width: 100%;
   height: 24em;
 }
 
 .ks-Info {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   padding: 10px 10px 2px 10px;
   font-size: smaller;
 }
@@ -201,7 +204,7 @@
 }
 
 .ks-List .ks-SinkItem-selected {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
 }
 
 .ks-images-Image {
@@ -219,7 +222,7 @@
 }
 
 .ks-layouts-Label {
-  background-color: #C3D9FF;
+  background-color: #B8B8B8;
   font-weight: bold;
   margin-top: 1em;
   padding: 2px 0px 2px 0px;
@@ -228,7 +231,7 @@
 
 .ks-layouts-Scroller {
   height: 128px;
-  border: 2px solid #C3D9FF;
+  border: 2px solid #B8B8B8;
   padding: 8px;
   margin: 8px;
 }
@@ -245,7 +248,13 @@
   padding: 4px;
 }
 
+.rule-breditor-Table {
+  background-color: #FDFCDC;
+  border: 1px solid #87B3FF;
+  padding: 4px;
+}
 
+
 .rule-ListHeader {
 	background-image: url(images/gray_gradient.gif);
 	background-repeat: repeat-x;

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/AppTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/AppTest.java	2006-09-13 09:15:29 UTC (rev 6192)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/AppTest.java	2006-09-13 09:36:49 UTC (rev 6193)
@@ -17,6 +17,7 @@
      */
     public AppTest( String testName )
     {
+        
         super( testName );
     }
 




More information about the jboss-svn-commits mailing list