[jboss-svn-commits] JBL Code SVN: r32907 - 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-17 10:59:23 -0400 (Mon, 17 May 2010)
New Revision: 32907

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
Log:
GUVNOR-543: Expression Builder Widget's combobox disappears
	- Adding support for ExpressionFieldVariable: Rigth now, no methods/attributes are set in the combobox for this type. But at least you can use Field variables now.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java	2010-05-17 14:57:11 UTC (rev 32906)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ExpressionBuilder.java	2010-05-17 14:59:23 UTC (rev 32907)
@@ -19,6 +19,7 @@
 import org.drools.ide.common.client.modeldriven.brl.ExpressionCollection;
 import org.drools.ide.common.client.modeldriven.brl.ExpressionCollectionIndex;
 import org.drools.ide.common.client.modeldriven.brl.ExpressionField;
+import org.drools.ide.common.client.modeldriven.brl.ExpressionFieldVariable;
 import org.drools.ide.common.client.modeldriven.brl.ExpressionFormLine;
 import org.drools.ide.common.client.modeldriven.brl.ExpressionGlobalVariable;
 import org.drools.ide.common.client.modeldriven.brl.ExpressionMethod;
@@ -118,7 +119,12 @@
         String attrib = value.substring(dotPos + 1);
         if (prefix.equals(VARIABLE_VALUE_PREFIX)) {
             FactPattern fact = getRuleModel().getBoundFact(attrib);
-            ExpressionVariable variable = new ExpressionVariable(fact);
+            ExpressionPart variable;
+            if (fact!=null){
+                variable = new ExpressionVariable(fact);
+            }else{
+               variable = new ExpressionFieldVariable(attrib);
+            }
             expression.appendPart(variable);
 
         } else if (prefix.equals(GLOBAL_VARIABLE_VALUE_PREFIX)) {
@@ -269,6 +275,10 @@
     private Map<String, String> getCompletionsForCurrentType() {
         Map<String, String> completions = new LinkedHashMap<String, String>();
 
+        if (SuggestionCompletionEngine.TYPE_FINAL_OBJECT.equals(getCurrentGenericType())) {
+            return completions;
+        }
+
         if (SuggestionCompletionEngine.TYPE_COLLECTION.equals(getCurrentGenericType())) {
             completions.put("size()", "size");
             completions.put("first()", "first");