[jboss-svn-commits] JBL Code SVN: r9458 - in labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms: client/common and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Feb 12 17:17:33 EST 2007


Author: michael.neale at jboss.com
Date: 2007-02-12 17:17:33 -0500 (Mon, 12 Feb 2007)
New Revision: 9458

Added:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/dsl.gif
Removed:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
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/common/AssetFormats.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.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
Log:
JBRULES-654

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	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -5,13 +5,14 @@
 
 import org.drools.brms.client.categorynav.CategoryExplorerWidget;
 import org.drools.brms.client.categorynav.CategorySelectHandler;
+import org.drools.brms.client.common.AssetFormats;
 import org.drools.brms.client.common.ErrorPopup;
 import org.drools.brms.client.common.GenericCallback;
 import org.drools.brms.client.common.LoadingPopup;
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
 import org.drools.brms.client.rpc.RuleAsset;
 import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.ruleeditor.NewRuleWizard;
+import org.drools.brms.client.ruleeditor.NewAssetWizard;
 import org.drools.brms.client.ruleeditor.RuleViewer;
 import org.drools.brms.client.rulelist.EditItemEvent;
 import org.drools.brms.client.rulelist.AssetItemListViewer;
@@ -115,12 +116,12 @@
               int left = 70;
               int top = 100;
                 
-              NewRuleWizard pop = new NewRuleWizard(new EditItemEvent() {
+              NewAssetWizard pop = new NewAssetWizard(new EditItemEvent() {
                   public void open(String key) {                  
                       showLoadEditor( key );
                       
                   }
-              });
+              }, true, null, "Create a new rule");
               pop.setPopupPosition( left, top );
               
               pop.show();
@@ -183,7 +184,15 @@
               if (displayName.length() > 10) {
                   displayName = displayName.substring( 0, 7 ) + "...";
               }
-              tab.add( view, "<img src='images/rule_asset.gif'>" + displayName, true );
+              String icon = "rule_asset.gif";
+              if (asset.metaData.format.equals( AssetFormats.DRL )) {
+                  icon = "technical_rule_assets.gif";
+              } else if (asset.metaData.format.equals( AssetFormats.DSL )) {
+                  icon = "dsl.gif";
+              } else if (asset.metaData.format.equals( AssetFormats.FUNCTION )) {
+                  icon = "function_assets.gif";
+              }
+              tab.add( view, "<img src='images/" + icon + "'>" + displayName, true );
               
               openedViewers.put(uuid, view);
               

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -21,6 +21,8 @@
     /** For "model" assets */
     public static final String MODEL = "model";
 
+    public static final String DSL = "dsl";
+
     /** Vanilla DRL "file" */
     public static String DRL = "drl";
     

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -7,10 +7,9 @@
 import org.drools.brms.client.rpc.PackageConfigData;
 import org.drools.brms.client.rpc.RepositoryServiceFactory;
 import org.drools.brms.client.rpc.TableDataResult;
-import org.drools.brms.client.ruleeditor.NewRuleWizard;
+import org.drools.brms.client.ruleeditor.NewAssetWizard;
 import org.drools.brms.client.rulelist.AssetItemListViewer;
 import org.drools.brms.client.rulelist.EditItemEvent;
-import org.drools.brms.client.table.SortableTable;
 
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
@@ -111,11 +110,11 @@
               int left = 70;
               int top = 100;
                 
-              NewRuleWizard pop = new NewRuleWizard(new EditItemEvent() {
+              NewAssetWizard pop = new NewAssetWizard(new EditItemEvent() {
                   public void open(String key) {                  
                       editEvent.open( key );                      
                   }
-              });
+              }, true, null, "Create a new rule asset");
               pop.setPopupPosition( left, top );
               
               pop.show();
@@ -123,8 +122,46 @@
             
         });
         
+        final Image newFunction = new Image("images/function_assets.gif");
+        newFunction.setTitle( "Create a new function" );
+        newFunction.addClickListener( new ClickListener() {
+            public void onClick(Widget w) {
+                int left = 70;
+                int top = 100;
+                  
+                NewAssetWizard pop = new NewAssetWizard(new EditItemEvent() {
+                    public void open(String key) {                  
+                        editEvent.open( key );                      
+                    }
+                }, false, AssetFormats.FUNCTION, "Create a new function");
+                pop.setPopupPosition( left, top );
+                
+                pop.show();                
+            }
+        } );
+        
+        final Image newDSL = new Image("images/dsl.gif");
+        newDSL.setTitle( "Create a new DSL (language configuration)" );
+        newDSL.addClickListener( new ClickListener() {
+            public void onClick(Widget w) {
+                int left = 70;
+                int top = 100;
+                  
+                NewAssetWizard pop = new NewAssetWizard(new EditItemEvent() {
+                    public void open(String key) {                  
+                        editEvent.open( key );                      
+                    }
+                }, false, AssetFormats.DSL, "Create a new language configuration");
+                pop.setPopupPosition( left, top );
+                
+                pop.show();                
+            }
+        } );        
+        
+        newWizards.add( newPackage );
         newWizards.add( newRule );
-        newWizards.add( newPackage );
+        newWizards.add( newFunction );
+        newWizards.add( newDSL );
         return newWizards;
 
     }
@@ -190,34 +227,7 @@
         pop.show();
     }
     
-    private void showNewFunction(Widget w) {
-        final FormStylePopup pop = new FormStylePopup("images/new_wiz.gif", "Create a new package");
-        final TextBox nameBox = new TextBox();
-        nameBox.setTitle( "The name of the package. Avoid spaces, use underscore instead." );
-        
-        pop.addAttribute( "Package name", nameBox );
-        final TextArea descBox = new TextArea();
-        pop.addAttribute( "Description", descBox );
-        
-        Button create = new Button("Create package");
-        create.addClickListener( new ClickListener() {
-            public void onClick(Widget w) {
-                pop.hide();
-            }
 
-        
-        });
-        
-        
-        pop.addAttribute( "", create );
-        
-        pop.setStyleName( "ks-popups-Popup" );
-        
-        pop.setPopupPosition( w.getAbsoluteLeft(), w.getAbsoluteTop() - 100 );
-        pop.show();
-        
-    }
-
     private void createPackageAction(final String name, final String descr) {
         LoadingPopup.showMessage( "Creating package - please wait..." );
         RepositoryServiceFactory.getService().createPackage( name, descr, new GenericCallback() {
@@ -242,16 +252,14 @@
                 loadPackageConfig(name);
             }
         }));
-
         
         pkg.addItem( makeItem("Business rules", "images/rule_asset.gif", showListEvent(name, AssetFormats.BUSINESS_RULE)) );
         pkg.addItem( makeItem("Technical rules", "images/technical_rule_assets.gif", showListEvent(name, AssetFormats.TECHNICAL_RULE)) );
         pkg.addItem( makeItem("Functions", "images/function_assets.gif", showListEvent(name, AssetFormats.FUNCTION)) );
+        pkg.addItem( makeItem("DSL", "images/dsl.gif", showListEvent(name, AssetFormats.DSL)) );
         pkg.addItem( makeItem("Model", "images/model_asset.gif", showListEvent(name, AssetFormats.MODEL) ) );
-
         
         exTree.addItem( pkg );
-
     }
 
 

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/DefaultRuleContentWidget.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -37,7 +37,7 @@
                 data.content = text.getText();
                 meta.dirty = true;
             }
-        });
+        }); 
         
 		initWidget(text);
 	}

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -27,7 +27,7 @@
 	
 	public MetaDataWidget(MetaData d, boolean readOnly, String uuid, Command refreshView) {
         
-        setStyleName( "editable-Surface" );
+        setStyleName( "metadata-Widget" );
         
         if (!readOnly) {
             addHeader( "images/meta_data.png", d.name );
@@ -53,7 +53,7 @@
         addAttribute("Created by:", readOnlyText(data.creator));
         addAttribute("Version number:", getVersionNumberLabel());
         addAttribute("Package:", readOnlyText(data.packageName));
-        addAttribute("Format:", readOnlyText( data.format ));
+        addAttribute("Format:", new HTML( "<b>" + data.format + "</b>" ));
         
         if (!readOnly) {
             addAttribute("Created on:", readOnlyDate( data.createdDate ));
@@ -130,6 +130,7 @@
         }
     }
 
+    
 
     private Label readOnlyText(String text) {
         Label lbl = new Label(text);

Copied: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java (from rev 9444, 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/NewAssetWizard.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewAssetWizard.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -0,0 +1,185 @@
+package org.drools.brms.client.ruleeditor;
+
+import org.drools.brms.client.categorynav.CategoryExplorerWidget;
+import org.drools.brms.client.categorynav.CategorySelectHandler;
+import org.drools.brms.client.common.AssetFormats;
+import org.drools.brms.client.common.GenericCallback;
+import org.drools.brms.client.common.LoadingPopup;
+import org.drools.brms.client.common.RulePackageSelector;
+import org.drools.brms.client.common.WarningPopup;
+import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.brms.client.rulelist.EditItemEvent;
+
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HTML;
+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.PopupPanel;
+import com.google.gwt.user.client.ui.TextArea;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * This provides a popup for creating a new rule/asset from scratch.
+ * reuses a few other widgets.
+ */
+public class NewAssetWizard extends PopupPanel {
+
+    private FlexTable              table       = new FlexTable(); //Using this table for the form layout
+    private TextBox                name        = new TextBox();
+    private TextArea               description = new TextArea();
+    private String                 initialCategory;
+    private CategoryExplorerWidget catChooser  = new CategoryExplorerWidget( new CategorySelectHandler() {
+                                                   public void selected(String selectedPath) {
+                                                       initialCategory = selectedPath;
+                                                   }
+                                               }, false );
+    private ListBox                 formatChooser = getFormatChooser();
+    
+    private RulePackageSelector packageSelector = new RulePackageSelector();
+    private EditItemEvent afterCreate;
+    private boolean showCats;
+    private String format;
+
+   
+
+    /** This is used when creating a new rule. */
+    public NewAssetWizard(EditItemEvent afterCreate, boolean showCats, String format, String title) {
+        super( true );
+        this.showCats = showCats;
+        this.format = format;
+        
+        this.afterCreate = afterCreate;
+        super.setWidth( "40%" );
+        table.setWidth( "100%" );
+        name.setWidth( "100%" );
+        
+        table.setWidget( 0,
+                         0,
+                         new Image( "images/new_wiz.gif" ) );
+        table.setWidget( 0,
+                         1,
+                         new HTML( "<b>" + title + "</b>" ) );        
+
+        table.setWidget( 1,
+                         0,
+                         new Label("Name:") );
+        table.setWidget( 1,
+                         1,
+                         name );
+        if (showCats) {
+            table.setWidget( 2, 0, new Label("Initial category:") );
+            table.setWidget( 2, 1, catChooser );
+        }
+        
+        if (format == null) {
+            table.setWidget( 3, 0, new Label("Type (format) of rule:" ));
+            table.setWidget( 3, 1, this.formatChooser );
+        } 
+        
+        table.setWidget( 4, 0, new Label("Package") );
+        table.setWidget( 4, 1, packageSelector );
+
+        description.setVisibleLines( 4 );
+        description.setWidth( "100%" );
+        table.setWidget( 5,
+                         0,
+                         new Label( "Initial Description:" ) );
+        table.setWidget( 5,
+                         1,
+                         description );
+
+        Button ok = new Button( "OK" );
+        ok.addClickListener( new ClickListener() {
+            public void onClick(Widget arg0) {
+                ok();
+            }
+
+        } );
+
+        table.setWidget( 6,
+                         0,
+                         ok );
+
+        Button cancel = new Button( "Cancel" );
+        cancel.addClickListener( new ClickListener() {
+            public void onClick(Widget w) {
+                cancel();
+            }
+
+        } );
+
+        table.setWidget( 6,
+                         1,
+                         cancel );
+
+        add( table );
+        setStyleName( "ks-popups-Popup" );
+    }
+
+    private ListBox getFormatChooser() {
+        
+        ListBox box = new ListBox();
+        
+        box.addItem( "Business rule", AssetFormats.BUSINESS_RULE );
+        box.addItem( "DRL file", AssetFormats.DRL );        
+        box.addItem( "Technical rule", AssetFormats.TECHNICAL_RULE );
+        box.addItem( "Business rule using a DSL template", AssetFormats.DSL_TEMPLATE_RULE );
+        
+        box.setSelectedIndex( 0 );
+        
+        return box;
+    }
+
+    /**
+     * When OK is pressed, it will update the repository with the new rule.
+     */
+    void ok() {
+        
+        if (this.showCats && this.initialCategory == null) {            
+            WarningPopup.showMessage( "You have to pick an initial category.", this.getAbsoluteLeft(), this.getAbsoluteTop() );
+            return;
+        } else if (this.name.getText() == null || "".equals( this.name.getText() )) {
+            WarningPopup.showMessage( "Rule must have a name", this.getAbsoluteLeft(), this.getAbsoluteTop() );
+            return;
+        }
+        
+        GenericCallback cb = new GenericCallback() {
+            public void onSuccess(Object result) {
+                    openEditor((String) result);
+                    hide();
+            }
+        };
+
+
+        LoadingPopup.showMessage( "Please wait ..." );
+        RepositoryServiceFactory.getService().createNewRule( name.getText(),
+                                                          description.getText(),
+                                                          initialCategory,
+                                                          packageSelector.getSelectedPackage(),
+                                                          getFormat(),
+                                                          cb );
+
+    }
+
+    private String getFormat() {
+        if (format != null) return format;
+        return formatChooser.getValue( formatChooser.getSelectedIndex() );
+    }
+
+    /**
+     * After creating the item we open it in the editor.
+     * @param uuid
+     */
+    protected void openEditor(String uuid) {
+        afterCreate.open( uuid );
+    }
+
+    void cancel() {
+        hide();
+    }
+
+}

Deleted: 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	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -1,181 +0,0 @@
-package org.drools.brms.client.ruleeditor;
-
-import org.drools.brms.client.RulesFeature;
-import org.drools.brms.client.categorynav.CategoryExplorerWidget;
-import org.drools.brms.client.categorynav.CategorySelectHandler;
-import org.drools.brms.client.common.AssetFormats;
-import org.drools.brms.client.common.ErrorPopup;
-import org.drools.brms.client.common.GenericCallback;
-import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.RulePackageSelector;
-import org.drools.brms.client.common.WarningPopup;
-import org.drools.brms.client.rpc.RepositoryServiceFactory;
-import org.drools.brms.client.rpc.RuleAsset;
-import org.drools.brms.client.rulelist.EditItemEvent;
-
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HTML;
-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.PopupPanel;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.Widget;
-
-/**
- * This provides a popup for creating a new rule from scratch.
- * reuses a few other widgets.
- */
-public class NewRuleWizard extends PopupPanel {
-
-    private FlexTable              table       = new FlexTable(); //Using this table for the form layout
-    private TextBox                name        = new TextBox();
-    private TextArea               description = new TextArea();
-    private String                 initialCategory;
-    private CategoryExplorerWidget catChooser  = new CategoryExplorerWidget( new CategorySelectHandler() {
-                                                   public void selected(String selectedPath) {
-                                                       initialCategory = selectedPath;
-                                                   }
-                                               }, false );
-    private ListBox                 formatChooser = getFormatChooser();
-    
-    private RulePackageSelector packageSelector = new RulePackageSelector();
-    private EditItemEvent afterCreate;
-
-   
-
-    /** This is used when creating a new rule. */
-    public NewRuleWizard(EditItemEvent afterCreate) {//, boolean showCats, String format, String title, String assetType) {
-        super( true );
-        this.afterCreate = afterCreate;
-        super.setWidth( "40%" );
-        table.setWidth( "100%" );
-        name.setWidth( "100%" );
-        
-        table.setWidget( 0,
-                         0,
-                         new Image( "images/new_wiz.gif" ) );
-        table.setWidget( 0,
-                         1,
-                         new HTML( "<b>Create a new rule</b>" ) );        
-
-        table.setWidget( 1,
-                         0,
-                         new Label( "Rule name" ) );
-        table.setWidget( 1,
-                         1,
-                         name );
-        
-        table.setWidget( 2, 0, new Label("Initial category") );
-        table.setWidget( 2, 1, catChooser );
-        
-        table.setWidget( 3, 0, new Label("Type (format) of rule" ));
-        table.setWidget( 3, 1, this.formatChooser );
-        
-        table.setWidget( 4, 0, new Label("Package") );
-        table.setWidget( 4, 1, packageSelector );
-
-        description.setVisibleLines( 4 );
-        description.setWidth( "100%" );
-        table.setWidget( 5,
-                         0,
-                         new Label( "Initial Description" ) );
-        table.setWidget( 5,
-                         1,
-                         description );
-
-        Button ok = new Button( "OK" );
-        ok.addClickListener( new ClickListener() {
-            public void onClick(Widget arg0) {
-                ok();
-            }
-
-        } );
-
-        table.setWidget( 6,
-                         0,
-                         ok );
-
-        Button cancel = new Button( "Cancel" );
-        cancel.addClickListener( new ClickListener() {
-            public void onClick(Widget w) {
-                cancel();
-            }
-
-        } );
-
-        table.setWidget( 6,
-                         1,
-                         cancel );
-
-        add( table );
-        setStyleName( "ks-popups-Popup" );
-    }
-
-    private ListBox getFormatChooser() {
-        
-        ListBox box = new ListBox();
-        
-        box.addItem( "Business rule", AssetFormats.BUSINESS_RULE );
-        box.addItem( "DRL file", AssetFormats.DRL );        
-        box.addItem( "Technical rule", AssetFormats.TECHNICAL_RULE );
-        box.addItem( "Business rule using a DSL template", AssetFormats.DSL_TEMPLATE_RULE );
-        
-        box.setSelectedIndex( 0 );
-        
-        return box;
-    }
-
-    /**
-     * When OK is pressed, it will update the repository with the new rule.
-     */
-    void ok() {
-        
-        if (this.initialCategory == null) {            
-            WarningPopup.showMessage( "You have to pick an initial category.", this.getAbsoluteLeft(), this.getAbsoluteTop() );
-            return;
-        } else if (this.name.getText() == null || "".equals( this.name.getText() )) {
-            WarningPopup.showMessage( "Rule must have a name", this.getAbsoluteLeft(), this.getAbsoluteTop() );
-            return;
-        }
-        
-        GenericCallback cb = new GenericCallback() {
-            public void onSuccess(Object result) {
-                    openEditor((String) result);
-                    hide();
-            }
-        };
-
-        if ( this.name.equals( "" ) ) {
-            ErrorPopup.showMessage( "You must choose a Category." );
-        } else {
-            LoadingPopup.showMessage( "Please wait ..." );
-            RepositoryServiceFactory.getService().createNewRule( name.getText(),
-                                                              description.getText(),
-                                                              initialCategory,
-                                                              packageSelector.getSelectedPackage(),
-                                                              formatChooser.getValue( formatChooser.getSelectedIndex() ),
-                                                              cb );
-
-        }
-    }
-
-    /**
-     * After creating the item we open it in the editor.
-     * @param uuid
-     */
-    protected void openEditor(String uuid) {
-        afterCreate.open( uuid );
-                
-    }
-
-    void cancel() {
-        hide();
-    }
-
-}

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-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/JBRMS.css	2007-02-12 22:17:33 UTC (rev 9458)
@@ -314,6 +314,10 @@
 //  padding: 4px;
 }
 
+.metadata-Widget {
+  border: 1px solid #B8B8B8;
+}
+
 .rule-error-Popup {
   background-color: red;
   border: 1px solid #B8B8B8;
@@ -439,7 +443,7 @@
 }
 
 .rule-SelectedRow {
-	background-image: url(images/blue_gradient.gif);
+	background-image: url(images/gray_gradient.gif);
 	background-repeat: repeat-x;
 }
 

Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/dsl.gif
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/dsl.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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	2007-02-12 22:08:41 UTC (rev 9457)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java	2007-02-12 22:17:33 UTC (rev 9458)
@@ -17,6 +17,7 @@
 import javax.jcr.version.VersionIterator;
 import javax.servlet.http.HttpSession;
 
+import org.drools.brms.client.common.AssetFormats;
 import org.drools.brms.client.rpc.MetaData;
 import org.drools.brms.client.rpc.PackageConfigData;
 import org.drools.brms.client.rpc.RepositoryService;
@@ -97,7 +98,17 @@
                                  String format) throws SerializableException {        
         try {
             PackageItem pkg = getRulesRepository().loadPackage( initialPackage );
-            AssetItem asset = pkg.addAsset( ruleName, description, initialCategory, format );            
+            AssetItem asset = pkg.addAsset( ruleName, description, initialCategory, format );
+            
+            if (format.equals( AssetFormats.DSL_TEMPLATE_RULE )) {
+                asset.updateContent( "when\n\nthen\n" );
+            } else if (format.equals( AssetFormats.FUNCTION )) {
+                asset.updateContent( "function " + ruleName + "(<args here>)\n\n\nend" );
+            } else if (format.equals( AssetFormats.DSL )) {
+                asset.updateContent( "[when]Condition sentence template {var}=" +
+                        "rule language mapping {var}\n" +
+                        "[then]Action sentence template=rule language mapping");
+            }
             getRulesRepository().save();
             return asset.getUUID();
         } catch (RulesRepositoryException e) {




More information about the jboss-svn-commits mailing list