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

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

Author: eaa
Date: 2010-04-14 15:15:17 -0400 (Wed, 14 Apr 2010)
New Revision: 32570

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/dt/TemplateModel.java
Log:
GUVNOR-527 Add the ability of creating Business Rules Templates using drools-templates 
	- Fixed a bug in TemplateModel that prevented Free Form DRL Lines to be properly converted to source code.
	- SuggestionCompletionEngine support fully qualified name for getModelFields() method.

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	2010-04-14 16:21:39 UTC (rev 32569)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java	2010-04-14 19:15:17 UTC (rev 32570)
@@ -691,8 +691,11 @@
     }
 
     private ModelField getField(String modelClassName, String fieldName){
-        ModelField[] fields = this.getModelFields().get(modelClassName);
 
+        String shortName = this.getFactNameFromType(modelClassName );
+
+        ModelField[] fields = this.getModelFields().get(shortName);
+
         if (fields == null){
             return null;
         }
@@ -709,11 +712,13 @@
     public String[] getModelFields(FieldAccessorsAndMutators accessorOrMutator,
                                    String modelClassName) {
 
-        if ( !this.getModelFields().containsKey( modelClassName ) ) {
+        String shortName = this.getFactNameFromType(modelClassName );
+
+        if ( !this.getModelFields().containsKey( shortName) ) {
             return new String[0];
         }
 
-        ModelField[] fields = this.getModelFields().get( modelClassName );
+        ModelField[] fields = this.getModelFields().get( shortName );
 
         List<String> fieldNames = new ArrayList<String>();
         fieldNames.add( "this" );
@@ -723,7 +728,7 @@
             if ( fields[i].getClassType() == FIELD_CLASS_TYPE.TYPE_DECLARATION_CLASS ) {
                 fieldNames.add( fieldName );
             } else if ( FieldAccessorsAndMutators.compare( accessorOrMutator,
-                                                           this.accessorsAndMutators.get( modelClassName + "." + fieldName ) ) ) {
+                                                           this.accessorsAndMutators.get( shortName + "." + fieldName ) ) ) {
                 fieldNames.add( fieldName );
             }
         }
@@ -733,11 +738,13 @@
 
     public String[] getModelFields(String modelClassName){
 
-        if (!this.getModelFields().containsKey(modelClassName)){
+        String shortName = this.getFactNameFromType(modelClassName );
+
+        if (!this.getModelFields().containsKey(shortName)){
             return new String[0];
         }
 
-        ModelField[] fields = this.getModelFields().get(modelClassName);
+        ModelField[] fields = this.getModelFields().get(shortName);
 
         String[] fieldNames = new String[fields.length];
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java	2010-04-14 16:21:39 UTC (rev 32569)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java	2010-04-14 19:15:17 UTC (rev 32570)
@@ -142,14 +142,14 @@
 				visitSingleFieldConstraint((SingleFieldConstraint) o);
 			} else if (o instanceof CompositeFactPattern) {
 				visitCompositeFactPattern((CompositeFactPattern) o);
-			} else if (o instanceof FromCompositeFactPattern) {
-				visitFromCompositeFactPattern((FromCompositeFactPattern) o);
 			} else if (o instanceof FreeFormLine) {
 				visitFreeFormLine((FreeFormLine) o);
 			} else if (o instanceof FromAccumulateCompositeFactPattern) {
 				visitFromAccumulateCompositeFactPattern((FromAccumulateCompositeFactPattern) o);
 			} else if (o instanceof FromCollectCompositeFactPattern) {
 				visitFromCollectCompositeFactPattern((FromCollectCompositeFactPattern) o);
+			} else if (o instanceof FromCompositeFactPattern) {
+				visitFromCompositeFactPattern((FromCompositeFactPattern) o);
 			} else if (o instanceof DSLSentence) {
 				visitDSLSentence((DSLSentence) o);
 			} else if (o instanceof ActionFieldList) {