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

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

Author: michael.neale at jboss.com
Date: 2008-08-04 20:10:09 -0400 (Mon, 04 Aug 2008)
New Revision: 21347

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java
Log:
drop down queries were not being stored in a map consistently

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java	2008-08-04 16:30:42 UTC (rev 21346)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java	2008-08-05 00:10:09 UTC (rev 21347)
@@ -352,7 +352,8 @@
 		for (Iterator iterator = dataEnumLists.keySet().iterator(); iterator.hasNext();) {
 			String key = (String) iterator.next();
 			if (key.startsWith(factType + "." + field)) {
-				return (String) dataEnumLists.get(key);
+				String[] qry =  (String[]) dataEnumLists.get(key);
+				return qry[0];
 			}
 		}
 		throw new IllegalStateException();

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java	2008-08-04 16:30:42 UTC (rev 21346)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java	2008-08-05 00:10:09 UTC (rev 21347)
@@ -60,9 +60,9 @@
 				} else {
 					addError("The item with " + key + " is not a list or a string, it is a " + list.getClass().getName());
 				}
-				return Collections.EMPTY_MAP;
+				return new HashMap();
 			} else if (list instanceof String) {
-				newMap.put(key, list);
+				newMap.put(key, new String[] {(String)list});
 			} else {
 				List items = (List) list;
 				String[] newItems = new String[items.size()];

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java	2008-08-04 16:30:42 UTC (rev 21346)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java	2008-08-05 00:10:09 UTC (rev 21347)
@@ -282,7 +282,7 @@
     	final SuggestionCompletionEngine sce = new SuggestionCompletionEngine();
     	sce.dataEnumLists = new HashMap();
     	sce.dataEnumLists.put("Fact.type", new String[] {"sex", "colour"});
-    	sce.dataEnumLists.put("Fact.value[f1, f2]", "select something from database where x=@{f1} and y=@{f2}");
+    	sce.dataEnumLists.put("Fact.value[f1, f2]", new String[] {"select something from database where x=@{f1} and y=@{f2}"});
 
 
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java	2008-08-04 16:30:42 UTC (rev 21346)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java	2008-08-05 00:10:09 UTC (rev 21347)
@@ -96,7 +96,8 @@
     	assertFalse(loader.hasErrors());
 
     	Map data = loader.getData();
-    	String s = (String) data.get("Person.type[sex]");
+    	String[] sl = (String[]) data.get("Person.type[sex]");
+    	String s = sl[0];
     	assertEquals("something @{sex}", s);
     	Map context = new HashMap() {{ put("sex", "cool"); }};
 
@@ -107,7 +108,8 @@
     	loader = new DataEnumLoader("'Person.type[sex, money]' : '@{sex} @{money}'");
     	assertFalse(loader.hasErrors());
 
-    	s = (String) loader.getData().get("Person.type[sex, money]");
+    	sl = (String[]) loader.getData().get("Person.type[sex, money]");
+    	s = sl[0];
     	assertEquals("@{sex} @{money}", s);
 
     }