[jboss-svn-commits] JBL Code SVN: r36732 - in labs/jbossrules/soa_branches/BRMS-5.1.x: drools-repo and 1 other directory.

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

Author: tsurdilovic
Date: 2011-02-24 17:47:26 -0500 (Thu, 24 Feb 2011)
New Revision: 36732

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java
   labs/jbossrules/soa_branches/BRMS-5.1.x/drools-repo/pom.xml
Log:
BRMS-536 Enum support in Guvnor is not functional

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java	2011-02-24 22:45:38 UTC (rev 36731)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/EnumDropDownLabel.java	2011-02-24 22:47:26 UTC (rev 36732)
@@ -22,6 +22,7 @@
 import org.drools.ide.common.client.modeldriven.SuggestionCompletionEngine;
 import org.drools.ide.common.client.modeldriven.brl.FactPattern;
 import org.drools.ide.common.client.modeldriven.brl.BaseSingleFieldConstraint;
+import org.drools.ide.common.client.modeldriven.brl.SingleFieldConstraint;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.Command;
@@ -118,11 +119,19 @@
                                              fieldName );
 
         final DropDownData dropDownData;
-        if ( SuggestionCompletionEngine.TYPE_BOOLEAN.equals( valueType ) ) {
-            dropDownData = DropDownData.create( new String[]{"true", "false"} ); //NON-NLS
-        } else {
-            dropDownData = sce.getEnums( pattern,
-                                         fieldName );
+        if (SuggestionCompletionEngine.TYPE_BOOLEAN.equals(valueType)) {
+        	
+            dropDownData = DropDownData.create(new String[]{"true", "false"}); //NON-NLS
+            
+        } else if(constraint instanceof SingleFieldConstraint && ((SingleFieldConstraint)constraint).getParent() !=null
+        	&& ((SingleFieldConstraint)constraint).getParent() instanceof SingleFieldConstraint){
+        	
+        	SingleFieldConstraint subFact =(SingleFieldConstraint) ((SingleFieldConstraint)constraint).getParent();
+            dropDownData = DropDownData.create(sce.getEnumValues(subFact.getFieldType(),fieldName));
+            
+        }else{
+        	
+            dropDownData = sce.getEnums(pattern, fieldName);
         }
 
         final EnumDropDown box = new EnumDropDown( constraint.getValue(),

Modified: labs/jbossrules/soa_branches/BRMS-5.1.x/drools-repo/pom.xml
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.x/drools-repo/pom.xml	2011-02-24 22:45:38 UTC (rev 36731)
+++ labs/jbossrules/soa_branches/BRMS-5.1.x/drools-repo/pom.xml	2011-02-24 22:47:26 UTC (rev 36732)
@@ -14,6 +14,6 @@
      <module>drools-repository</module>
      <module>jcr-api</module>
      <module>jcr-jr-impl</module>
-     <module>jcr-ms-impl</module>
+     <!-- <module>jcr-ms-impl</module> -->
    </modules>
 </project>