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

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

Author: baunax
Date: 2010-04-14 12:21:04 -0400 (Wed, 14 Apr 2010)
New Revision: 32568

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/server/util/BRDRLPersistence.java
Log:
GUVNOR-527 Add the ability of creating Business Rules Templates using drools-templates
- Don't quote interpolation variables

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:05:39 UTC (rev 32567)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java	2010-04-14 16:21:04 UTC (rev 32568)
@@ -94,30 +94,6 @@
 		Map<String, Integer> result = new HashMap<String, Integer>();
 		new RuleModelVisitor(result).visit(this);
 		return result;
-//        for (IPattern pattern : this.lhs) {
-//            if (pattern instanceof FactPattern) {
-//                FactPattern fact = (FactPattern) pattern;
-//                for (FieldConstraint fc : fact.getFieldConstraints()) {
-//                    if (fc instanceof ISingleFieldConstraint) {
-//                        ISingleFieldConstraint con = (ISingleFieldConstraint) fc;
-//                        if (ISingleFieldConstraint.TYPE_TEMPLATE == con.constraintValueType && !result.containsKey(con.value)) {
-//                            result.put(con.value, result.size());
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//        for (IAction action : this.rhs) {
-//            if (action instanceof ActionInsertFact) {
-//                ActionInsertFact fact = (ActionInsertFact) action;
-//                for (ActionFieldValue afv : fact.fieldValues) {
-//                	if (afv.nature == ActionFieldValue.TYPE_TEMPLATE && !result.containsKey(afv.value)) {
-//                		result.put(afv.value, result.size());
-//                	}
-//                }
-//            }
-//        }
-//        return result;
 	}
 
 	public Map<String, List<String>> getTable() {
@@ -170,10 +146,10 @@
 				visitFromCompositeFactPattern((FromCompositeFactPattern) o);
 			} else if (o instanceof FreeFormLine) {
 				visitFreeFormLine((FreeFormLine) o);
-			} else if (o instanceof FromCollectCompositeFactPattern) {
-				visitFromCollectCompositeFactPattern((FromCollectCompositeFactPattern) o);
 			} else if (o instanceof FromAccumulateCompositeFactPattern) {
 				visitFromAccumulateCompositeFactPattern((FromAccumulateCompositeFactPattern) o);
+			} else if (o instanceof FromCollectCompositeFactPattern) {
+				visitFromCollectCompositeFactPattern((FromCollectCompositeFactPattern) o);
 			} else if (o instanceof DSLSentence) {
 				visitDSLSentence((DSLSentence) o);
 			} else if (o instanceof ActionFieldList) {
@@ -236,6 +212,7 @@
 
 		private void visitFromCompositeFactPattern(FromCompositeFactPattern pattern) {
         	visit(pattern.getFactPattern());
+        	parseStringPattern(pattern.getExpression().getText());
         }
 
 		private void visitFromCollectCompositeFactPattern(FromCollectCompositeFactPattern pattern) {

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java	2010-04-14 16:05:39 UTC (rev 32567)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java	2010-04-14 16:21:04 UTC (rev 32568)
@@ -455,13 +455,7 @@
                     }
                     break;
                 case ISingleFieldConstraint.TYPE_TEMPLATE:
-                	if (operator.equals("in")) {
-                        buf.append(value);
-                    } else {
-                        buf.append("\"@{");
-                        buf.append(value);
-                        buf.append("}\"");
-                    }
+                	buf.append("@{").append(value).append("}");
                 	break;
                 default:
                     buf.append(value);
@@ -624,6 +618,8 @@
                 buf.append("( ");
                 if (fieldValues[i].isFormula()) {
                     buf.append(fieldValues[i].value.substring(1));
+                } else if (fieldValues[i].nature == ActionFieldValue.TYPE_TEMPLATE) {
+                	buf.append("@{").append(fieldValues[i].value).append("}");
                 } else if (SuggestionCompletionEngine.TYPE_STRING.equals(fieldValues[i].type)) {
                     buf.append("\"");
                     buf.append(generateFieldValue(fieldValues[i]));
@@ -636,9 +632,6 @@
         }
 
 		private String generateFieldValue(final ActionFieldValue fieldValue) {
-			if (fieldValue.nature == ActionFieldValue.TYPE_TEMPLATE) {
-				return "@{" + fieldValue.value + "}";
-			}
 			return fieldValue.value;
 		}