[jboss-svn-commits] JBL Code SVN: r32875 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: ruleeditor and 1 other directory.

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

Author: eaa
Date: 2010-05-13 12:15:45 -0400 (Thu, 13 May 2010)
New Revision: 32875

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java
Log:
GUVNOR-541: Add the possibility of create Working Sets
	- Fixed a NPE when active Working Sets didn't contain Fact Types.
	- Fixed a JS error cause because of an unnecessary double call to a Command before Working Set selector popup was closed. 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java	2010-05-13 14:57:09 UTC (rev 32874)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/SuggestionCompletionCache.java	2010-05-13 16:15:45 UTC (rev 32875)
@@ -114,9 +114,9 @@
     	SuggestionCompletionEngine sce = cache.get(packageName);
         if (sce != null) {
         	sce.setFactTypeFilter(null);
-        	if (done != null) {
-        		done.execute();
-        	}
+//        	if (done != null) {
+//        		done.execute();
+//        	}
             cache.remove( packageName );
             loadPackage( packageName, done );
         } else {

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java	2010-05-13 14:57:09 UTC (rev 32874)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/WorkingSetManager.java	2010-05-13 16:15:45 UTC (rev 32875)
@@ -95,7 +95,9 @@
             final Set<String> validFacts = new HashSet<String>();
             for (RuleAsset asset : wss) {
                 WorkingSetConfigData wsConfig = (WorkingSetConfigData) asset.content;
-                validFacts.addAll(Arrays.asList(wsConfig.validFacts));
+                if (wsConfig.validFacts != null && wsConfig.validFacts.length > 0){
+                    validFacts.addAll(Arrays.asList(wsConfig.validFacts));
+                }
             }
 
             SuggestionCompletionCache.getInstance().applyFactFilter(packageName, 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java	2010-05-13 14:57:09 UTC (rev 32874)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/WorkingSetSelectorPopup.java	2010-05-13 16:15:45 UTC (rev 32875)
@@ -16,6 +16,7 @@
  */
 
 
+import com.google.gwt.event.dom.client.ClickEvent;
 import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.client.common.FormStylePopup;
 import org.drools.guvnor.client.common.GenericCallback;
@@ -26,10 +27,9 @@
 import org.drools.guvnor.client.rpc.TableDataResult;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
 import org.drools.guvnor.client.modeldriven.ui.RuleModeller;
@@ -78,9 +78,9 @@
 				});
 
         save = new Button(constants.SaveAndClose());
-        save.addClickListener(new ClickListener() {
+        save.addClickHandler(new ClickHandler() {
 
-            public void onClick(Widget widget) {
+            public void onClick(ClickEvent event) {
                 TreeNode[] checked = treePanel.getChecked();
 
                 String[] wsUUIDs = new String[checked.length];
@@ -99,6 +99,7 @@
                         }
                     });
             }
+
         });
 
         treePanel.setHeight(100);