[jboss-svn-commits] JBL Code SVN: r8432 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client main/java/org/drools/brms/client/modeldriven/ui main/java/org/drools/brms/client/rpc main/java/org/drools/brms/client/rpc/mock main/java/org/drools/brms/client/ruleeditor main/java/org/drools/brms/client/rulelist main/java/org/drools/brms/public main/java/org/drools/brms/server test/java/org/drools/brms/server

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Dec 20 06:41:44 EST 2006


Author: michael.neale at jboss.com
Date: 2006-12-20 06:41:26 -0500 (Wed, 20 Dec 2006)
New Revision: 8432

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.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/DSLSentenceWidget.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/client/rpc/RepositoryService.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
   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/server/JBRMSServiceServlet.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
some visual changes, and refactoring on rule tab launching

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -44,7 +44,7 @@
         tab.setWidth("100%");
         tab.setHeight("100%");        
 
-        FlexTable explorePanel = doExplore(tab);        
+        FlexTable explorePanel = doExplore();        
         //RuleView ruleViewer = doRuleViewer();
         
         tab.add(explorePanel, "Explore");
@@ -58,7 +58,7 @@
     
 
     /** This will setup the explorer tab */
-	private FlexTable doExplore(final TabPanel tab) {
+	private FlexTable doExplore() {
 		FlexTable  table = new FlexTable();
         final RulesFeature parent = this;
         //and the the delegate to open an editor for a rule resource when
@@ -67,9 +67,8 @@
             
 
             public void open(String key,
-                             String type,
                              String name) {                  
-                RuleViewer view = new RuleViewer(parent, key, name);
+                RuleViewer view = new RuleViewer(key, name);
                 
                 String displayName = name;
                 if (name.length() > 10) {
@@ -117,8 +116,8 @@
         newRule.addClickListener( new ClickListener() {
 
             public void onClick(Widget w) {
-                int left = 70;//w.getAbsoluteLeft() - 10;
-                int top = 100; //w.getAbsoluteTop() - 10;
+              int left = 70;//w.getAbsoluteLeft() - 10;
+              int top = 100; //w.getAbsoluteTop() - 10;
                 
               NewRuleWizard pop = new NewRuleWizard();
               pop.setPopupPosition( left, top );
@@ -133,8 +132,6 @@
         formatter.setAlignment( 1, 0, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_TOP);
         formatter.setStyleName( 1, 0, "rule-explorer-NewPopups" );
         
-        
-
 		return table;
 	}
 

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	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionRetractFactWidget.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -23,7 +23,7 @@
         layout.setStyleName( "model-builderInner-Background" );
         
         layout.setWidget( 0, 0, new Label(com.getActionDisplayName( "retract" )) );
-        layout.setWidget( 0, 1, new Label(model.variableName) );
+        layout.setWidget( 0, 1, new Label( "[" + model.variableName + "]") );
         
         initWidget( layout );
     }

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	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -106,7 +106,7 @@
         } );
         
         horiz.add( edit );
-        horiz.add( new Label(completions.getActionDisplayName("set") + " " + model.variable) );
+        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/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/DSLSentenceWidget.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -13,39 +13,13 @@
 
 /**
  * This displays a widget to edit a DSL sentence.
- * 
  * @author Michael Neale
- *
  */
 public class DSLSentenceWidget extends Composite {
 
     private HorizontalPanel horiz = new HorizontalPanel();
     
-    /**
-     * @param sentence The sentence to render/bind to.
-     * @param lastOne true if this is the last one to render.
-     * @param firstOne true if this is the first one to render.
-     */
-    public DSLSentenceWidget(DSLSentence sentence, boolean lastOne, boolean firstOne) {
-        
-        
-        if (lastOne) {
-            this.horiz.setStyleName( "model-builderInnerLastRow-Background" );
-        }
-        if (firstOne) {
-            this.horiz.setStyleName( "model-builderInnerFirstRow-Background" );
-        }
-        if (!lastOne && !firstOne) {
-            this.horiz.setStyleName( "model-builderInnerNoBorders-Background" );
-        }
-        
-        init( sentence );
-        
-        
-    }
-    
     public DSLSentenceWidget(DSLSentence sentence) {
-        this.horiz.setStyleName( "model-builderInner-Background" );
         init( sentence );
     }
 

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	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/RuleModeller.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -22,6 +22,7 @@
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
@@ -106,8 +107,11 @@
                 w = new ActionRetractFactWidget(this.completions, (ActionRetractFact) action );
             } else if (action instanceof DSLSentence) {
                 w = new DSLSentenceWidget((DSLSentence) action);
+                w.setStyleName( "model-builderInner-Background" );
             }
             
+            vert.add( spacerWidget() );
+            
             HorizontalPanel horiz = new HorizontalPanel();
             
             Image remove = new Image("images/delete_item_small.gif");
@@ -357,16 +361,14 @@
             Widget w = null;
             if (pattern instanceof FactPattern) {                  
                 w = new FactPatternWidget(this, pattern, completions, true) ;
-                addLhsWidget( model,
-                              vert,
+                vert.add( addLhsWidget( model,
                               i,
-                              w );
+                              w ) );
+                vert.add( spacerWidget() );
             } else if (pattern instanceof CompositeFactPattern) {
                 w = new CompositeFactPatternWidget(this, (CompositeFactPattern) pattern, completions) ;
-                addLhsWidget( model,
-                              vert,
-                              i,
-                              w );
+                vert.add( addLhsWidget( model, i, w ));
+                vert.add( spacerWidget() );
             } else if (pattern instanceof DSLSentence) {
                 //ignore this time                
             } else {
@@ -376,33 +378,36 @@
 
         }
         
-        boolean startedDSLSection = false;
+        
+        VerticalPanel dsls = new VerticalPanel();
         for ( int i = 0; i < model.lhs.length; i++ ) {
             IPattern pattern = model.lhs[i];
             Widget w = null;
             
             if (pattern instanceof DSLSentence) {
-                if (!startedDSLSection) {
-                    w = new DSLSentenceWidget((DSLSentence) pattern, false, true);
-                    startedDSLSection = true;
-                } else if (i == model.lhs.length - 1) {
-                    w = new DSLSentenceWidget((DSLSentence) pattern, true, false);
-                } else {
-                    w = new DSLSentenceWidget((DSLSentence) pattern, false, false);
-                }
-                addLhsWidget( model, vert, i, w );
-                
+                w = new DSLSentenceWidget((DSLSentence) pattern);
+
+                dsls.add( addLhsWidget( model, i, w ) );
+                dsls.setStyleName( "model-builderInner-Background" );
             }
         }
+        vert.add( dsls );
         
+        
+        
         return vert;
     }
 
+    private HTML spacerWidget() {
+        HTML h = new HTML("&nbsp;");
+        h.setHeight( "2px" );
+        return h;
+    }
+
     /**
      * This adds the widget to the UI, also adding the  
      */
-    private void addLhsWidget(final RuleModel model,
-                              VerticalPanel vert,
+    private Widget addLhsWidget(final RuleModel model,
                               int i,
                               Widget w) {
         HorizontalPanel horiz = new HorizontalPanel();
@@ -431,9 +436,10 @@
 
         horiz.add( w );
         horiz.add( remove );
-        
 
-        vert.add( horiz );
+        return horiz;
+
+        //vert.add( horiz );
     }
 
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -35,8 +35,9 @@
     
     /**
      * Creates a brand new rule with the initial category.
+     * Return the UUID of the item created.
      */
-    public Boolean createNewRule(String ruleName, String description, String initialCategory, String initialPackage, String format) throws SerializableException;
+    public String createNewRule(String ruleName, String description, String initialCategory, String initialPackage, String format) throws SerializableException;
     
     /**
      * This returns a list of packages where rules may be added.

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -120,7 +120,7 @@
         if (name.equals( "foo" )) {
             callback.onFailure( new SerializableException("thats naughty") );
         } else {
-            callback.onSuccess( new Boolean(true) );
+            callback.onSuccess( "UUID-1234567890" );
         }
         
         

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -140,16 +140,17 @@
             }
 
             public void onSuccess(Object result) {
-                if ( ((Boolean) result).booleanValue() ) {
+                if ( result != null ) {
+                    openEditor((String) result);
                     hide();
                 } else {
-                    ErrorPopup.showMessage( "Unable to create the rule." );
+                    ErrorPopup.showMessage( "Unable to create the item. Please contact your system administrator." );
                 }
             }
         };
 
         if ( this.name.equals( "" ) ) {
-            ErrorPopup.showMessage( "Can't have an empty category name." );
+            ErrorPopup.showMessage( "You must choose a Category." );
         } else {
             RepositoryServiceFactory.getService().createNewRule( name.getText(),
                                                               description.getText(),
@@ -161,6 +162,11 @@
         }
     }
 
+    protected void openEditor(String uuid) {
+        // TODO Auto-generated method stub
+        
+    }
+
     void cancel() {
         hide();
     }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -1,6 +1,5 @@
 package org.drools.brms.client.ruleeditor;
 
-import org.drools.brms.client.RulesFeature;
 import org.drools.brms.client.common.ErrorPopup;
 import org.drools.brms.client.common.WarningPopup;
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
@@ -36,8 +35,7 @@
      * @param format The type of resource (may determine what editor is used).
      * @param name The name to be displayed.
      */
-    public RuleViewer(RulesFeature parent,
-                      String UUID,
+    public RuleViewer(String UUID,
                       String name) {
         this.resourceUUID = UUID;
         this.name = name;

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/EditItemEvent.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -11,6 +11,6 @@
      * @param type - the resource type.
      * @param name - the name to display on the open tab.
      */
-    public void open(String key, String type, String name);
+    public void open(String key, String name);
     
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rulelist/RuleItemListViewer.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -77,7 +77,7 @@
         Image openIcon = new Image( "images/open_item.gif" );
         openIcon.addClickListener( new ClickListener() {
             public void onClick(Widget w) {
-                openItemEvent.open( TableDataRow.getId( table.getSelectedKey()), TableDataRow.getFormat( table.getSelectedKey() ), table.getText( table.getSelectedRow(), 1 ) );
+                openItemEvent.open( TableDataRow.getId( table.getSelectedKey()), table.getText( table.getSelectedRow(), 1 ) );
             }
         } );
         openIcon.setTitle( "Open item" );

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-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2006-12-20 11:41:26 UTC (rev 8432)
@@ -115,13 +115,14 @@
 
 .model-builder-Background {
   background-color: #FDFCDC;
-  border: 1px solid #87B3FF;
+  border: 1px solid #B8B8B8;
 }
 
 .model-builderInner-Background {
 	background-color: white;
-	border-top: 1px solid gray;
-	border-bottom: 1px solid gray;
+	border: 1px solid #B8B8B8;
+	//border-top: 1px solid gray;
+	//border-bottom: 1px solid gray;
 }
 
 .model-builderInnerInner-Background {
@@ -130,23 +131,7 @@
 	border-bottom: 0px solid gray;
 }
 
-.model-builderInnerFirstRow-Background {
-        background-color: white;
-	border-top: 1px solid gray;
-	border-bottom: 0px solid gray;
-}
 
-.model-builderInnerNoBorders-Background {
-        background-color: white;
-	border-top: 0px solid gray;
-	border-bottom: 0px solid gray;
-}
-
-.model-builderInnerLastRow-Background {
-        background-color: white;
-	border-top: 0px solid gray;
-	border-bottom: 1px solid gray;
-}
 .gwt-DialogBox { 
 	border: 1px solid #B8B8B8;
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -81,19 +81,20 @@
      * This will create a new asset. It will be saved, but not checked in.
      * The initial state will be the draft state.
      */
-    public Boolean createNewRule(String ruleName,
+    public String createNewRule(String ruleName,
                                  String description,
                                  String initialCategory,
                                  String initialPackage,
                                  String format) throws SerializableException {        
         try {
             PackageItem pkg = getRulesRepository().loadPackage( initialPackage );
-            pkg.addAsset( ruleName, description, initialCategory, format );            
-            getRulesRepository().save();            
+            AssetItem asset = pkg.addAsset( ruleName, description, initialCategory, format );            
+            getRulesRepository().save();
+            return asset.getUUID();
         } catch (RulesRepositoryException e) {
             throw new SerializableException(e.getMessage());
         }
-        return Boolean.TRUE;
+
     }
 
     public String[] listRulePackages() {

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2006-12-20 11:40:51 UTC (rev 8431)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2006-12-20 11:41:26 UTC (rev 8432)
@@ -60,8 +60,9 @@
       cat.addCategory( "testAddRule", "yeah" );
       
       
-      Boolean result = impl.createNewRule( "testAddRule", "a description", "testAddRule", "another", "txt" );
-      assertTrue(result.booleanValue());
+      String result = impl.createNewRule( "testAddRule", "a description", "testAddRule", "another", "txt" );
+      assertNotNull(result);
+      assertFalse("".equals( result ));
       
       String[] packages = impl.listRulePackages();
       assertTrue(packages.length > 0);




More information about the jboss-svn-commits mailing list