[jboss-svn-commits] JBL Code SVN: r36019 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: server and 1 other directories.

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

Author: eaa
Date: 2010-11-22 11:41:57 -0500 (Mon, 22 Nov 2010)
New Revision: 36019

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/guidededitor/NewRuleAssetProvider.java
Log:
GUVNOR-681: Create a new top component to display and run the Guided Editor (RuleModeller) and all the things it needs in order to run in a "standalone" way
	- It is possible now to specify the asset's format when creating new Assets (default is brl)

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java	2010-11-22 14:58:41 UTC (rev 36018)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/GuidedEditorManager.java	2010-11-22 16:41:57 UTC (rev 36019)
@@ -198,6 +198,27 @@
             }
         });
     }
+    
+    /**
+     * Returns the uuids of the assets that are being edited in JSON format.
+     * @return 
+     */
+    public String getAssetsUUIDs(){
+        StringBuilder uuids = new StringBuilder("[");
+        String separator = "";
+        for (int i = 0; i < this.assets.length; i++) {
+            uuids.append(separator);
+            uuids.append("'");
+            uuids.append(this.assets[i].uuid);
+            uuids.append("'");
+            if (separator.equals("")){
+                separator = ",";
+            }
+        }
+        uuids.append("]");
+        
+        return uuids.toString();
+    }
 
     /**
      * Creates 2 JS functions in window object: getDRLs() and getBRLs(). These
@@ -233,6 +254,10 @@
     
     registerAfterCancelButtonCallbackFunction: function (callbackFunction){
     this.afterCancelButtonCallbackFunction = callbackFunction;
+    },
+    
+    getAssetsUUIDs: function(){
+    return app. at org.drools.guvnor.client.ruleeditor.GuidedEditorManager::getAssetsUUIDs()();
     }
     }    
     $wnd.guidedEditorObject = guidedEditorObject;                                                                                                      

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java	2010-11-22 14:58:41 UTC (rev 36018)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/GuidedEditorServlet.java	2010-11-22 16:41:57 UTC (rev 36019)
@@ -37,7 +37,10 @@
         GE_CREATE_NEW_ASSET_PARAMETER_NAME("createNewAsset", false),
         
         //Only used when creating a new Rule
-        GE_RULE_PARAMETER_NAME("ruleName", false),
+        GE_ASSET_NAME_PARAMETER_NAME("assetName", false),
+        GE_ASSET_FORMAT_PARAMETER_NAME("assetFormat", false),
+        
+        
         GE_HIDE_RULE_LHS_PARAMETER_NAME("hideRuleLHS", false),
         GE_HIDE_RULE_RHS_PARAMETER_NAME("hideRuleRHS", false), 
         GE_HIDE_RULE_ATTRIBUTES_PARAMETER_NAME("hideRuleAttributes", false),

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java	2010-11-22 14:58:41 UTC (rev 36018)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/StandaloneGuidedEditorServiceImplementation.java	2010-11-22 16:41:57 UTC (rev 36019)
@@ -127,13 +127,15 @@
         if ( attribute != null ) {
             createNewAsset = Boolean.parseBoolean( attribute.toString() );
         }
-        String ruleName = (String) sessionParameters.get( GuidedEditorServlet.GUIDED_EDITOR_SERVLET_PARAMETERS.GE_RULE_PARAMETER_NAME.getParameterName() );
+        String assetName = (String) sessionParameters.get( GuidedEditorServlet.GUIDED_EDITOR_SERVLET_PARAMETERS.GE_ASSET_NAME_PARAMETER_NAME.getParameterName() );
+        String assetFormat = (String) sessionParameters.get( GuidedEditorServlet.GUIDED_EDITOR_SERVLET_PARAMETERS.GE_ASSET_FORMAT_PARAMETER_NAME.getParameterName() );
 
         RuleAssetProvider provider;
         if ( createNewAsset ) {
             provider = new NewRuleAssetProvider( packageName,
                                                  categoryName,
-                                                 ruleName );
+                                                 assetName,
+                                                 assetFormat);
             invocationParameters.setTemporalAssets(false);
         } else if ( assetsUUIDs != null ) {
             provider = new UUIDRuleAssetProvider( assetsUUIDs );

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/guidededitor/NewRuleAssetProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/guidededitor/NewRuleAssetProvider.java	2010-11-22 14:58:41 UTC (rev 36018)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/guidededitor/NewRuleAssetProvider.java	2010-11-22 16:41:57 UTC (rev 36019)
@@ -30,19 +30,21 @@
 
     private String packageName;
     private String categoryName; 
-    private String ruleName;
+    private String assetName;
+    private String assetFormat;
 
-    public NewRuleAssetProvider(String packageName, String categoryName, String ruleName) {
+    public NewRuleAssetProvider(String packageName, String categoryName, String assetName, String assetFormat) {
         this.packageName = packageName;
         this.categoryName = categoryName;
-        this.ruleName = ruleName;
+        this.assetName = assetName;
+        this.assetFormat = assetFormat != null?assetFormat:AssetFormats.BUSINESS_RULE;
     }
     
     public RuleAsset[] getRuleAssets() throws DetailedSerializationException {
         try {
-            //creates a new empty rule with a unique name (this is because
-            //multiple clients could be opening the same rule at the same time)
-            String ruleUUID = this.getService().createNewRule(ruleName, "created by standalone guided editor", categoryName, packageName, AssetFormats.BUSINESS_RULE);
+            //creates a new empty asset with the given name and format in the
+            //given package.
+            String ruleUUID = this.getService().createNewRule(assetName, "created by standalone guided editor", categoryName, packageName, this.assetFormat);
             RuleAsset newRule = this.getService().loadRuleAsset(ruleUUID);
 
             return new RuleAsset[]{newRule};