[jboss-svn-commits] JBL Code SVN: r32784 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui.

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

Author: eaa
Date: 2010-05-07 11:22:56 -0400 (Fri, 07 May 2010)
New Revision: 32784

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
Log:
JBRULES-2425: Add support for "From", "Accumulate" and "Collect" to Business Rule Editor
       -Minor adjustments 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java	2010-05-07 14:30:59 UTC (rev 32783)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java	2010-05-07 15:22:56 UTC (rev 32784)
@@ -88,7 +88,7 @@
         this.pattern = (FactPattern) p;
         this.completions = mod.getSuggestionCompletions();
         this.bindable = canBind;
-        
+
         this.connectives = new Connectives();
         this.connectives.setCompletions(completions);
         this.connectives.setModeller(mod);
@@ -129,7 +129,7 @@
 
     }
 
-    
+
 	/**
      * Render a hierarchy of constraints, hierarchy here means constraints that may
      * themselves depend on members of constraint objects. With this code, the GUI
@@ -381,7 +381,8 @@
         ClickListener click = new ClickListener() {
 
             public void onClick(Widget w) {
-                popupCreator.showPatternPopup(w, pattern.factType, null);
+                String factTypeShortName = (pattern.factType.contains(".")?pattern.factType.substring(pattern.factType.lastIndexOf(".")+1):pattern.factType);
+                popupCreator.showPatternPopup(w, factTypeShortName, null);
             }
         };
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-05-07 14:30:59 UTC (rev 32783)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FromCollectCompositeFactPatternWidget.java	2010-05-07 15:22:56 UTC (rev 32784)
@@ -41,9 +41,9 @@
 
     private void initExtraLeftSidePatternFactTypes(){
         extraLeftSidePatternFactTypes = new HashMap<String, String>();
-        extraLeftSidePatternFactTypes.put("Collection", "Collection");
-        extraLeftSidePatternFactTypes.put("List", "List");
-        extraLeftSidePatternFactTypes.put("Set", "Set");
+        extraLeftSidePatternFactTypes.put("Collection","java.util.Collection");
+        extraLeftSidePatternFactTypes.put("List","java.util.List");
+        extraLeftSidePatternFactTypes.put("Set","java.util.Set");
     }
 
     @Override
@@ -137,7 +137,7 @@
         box.addChangeListener(new ChangeListener() {
 
             public void onChange(Widget w) {
-                pattern.setFactPattern(new FactPattern(box.getItemText(box.getSelectedIndex())));
+                pattern.setFactPattern(new FactPattern(box.getValue(box.getSelectedIndex())));
                 getModeller().refreshWidget();
                 popup.hide();
             }