[jboss-svn-commits] JBL Code SVN: r32569 - in labs/jbossrules/trunk/drools-guvnor/src: test/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:39 -0400 (Wed, 14 Apr 2010)
New Revision: 32569

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.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-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java	2010-04-14 16:21:04 UTC (rev 32568)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/FactPatternWidget.java	2010-04-14 16:21:39 UTC (rev 32569)
@@ -118,8 +118,6 @@
         pattern.setFieldConstraints(sortedConst);
         drawConstraints(sortedConst);
 
-        
-
         if (this.readOnly){
             layout.addStyleName("editor-disabled-widget");
         }
@@ -148,13 +146,13 @@
 
         for (int i = 0; i < sortedConst.size(); i++) {
             int tabs = -1;
-            FieldConstraint current = (FieldConstraint) sortedConst.get(i);
+            FieldConstraint current = sortedConst.get(i);
             if (current instanceof SingleFieldConstraint) {
                 SingleFieldConstraint single = (SingleFieldConstraint) current;
                 FieldConstraint parent = single.parent;
 
                 for (int j = 0; j < parents.size(); j++) {
-                    FieldConstraint storedParent = (FieldConstraint) parents.get(j);
+                    FieldConstraint storedParent = parents.get(j);
                     if (storedParent != null && storedParent.equals(parent)) {
                         tabs = j + 1;
                         for (int k = j + 1; k < parents.size(); k++) {

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java	2010-04-14 16:21:04 UTC (rev 32568)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/BRDRTPersistenceTest.java	2010-04-14 16:21:39 UTC (rev 32569)
@@ -50,7 +50,7 @@
 				"rule \"with composite_0\"\n" + 
 				"	dialect \"mvel\"\n" + 
 				"	when\n" + 
-				"		$p : Person( name == \"name_na\" )\n" + 
+				"		$p : Person( name == name_na )\n" + 
 				"	then\n" + 
 				"end";
         TemplateModel m = new TemplateModel();
@@ -119,7 +119,7 @@
 		m.lhs[0] = fp;
 		
 		FreeFormLine ffl = new FreeFormLine();
-		ffl.text = "Cheese(type == \"@{type}\", price < @{price})";
+		ffl.text = "Cheese(type == @{type}, price < @{price})";
 		
 		m.lhs[1] = ffl;
 
@@ -130,8 +130,8 @@
 		aif.addFieldValue(afv);
 		m.rhs[0] = aif;
 
-		m.addRow(new String[] {"baunax", "Cheddar", "23", "34"});
-		m.addRow(new String[] {"diegoll", "Gouda", "17", "87"});
+		m.addRow(new String[] {"\"baunax\"", "\"Cheddar\"", "23", "34"});
+		m.addRow(new String[] {"\"diegoll\"", "\"Gouda\"", "17", "87"});
 		final String drl = p.marshal(m);
 		log.info("drl :\n{}", drl);
 
@@ -186,8 +186,8 @@
         aif.addFieldValue(afv);
         m.rhs[0] = aif;
         
-        m.addRow(new String[] {"baunax", "34"});
-        m.addRow(new String[] {"diegoll", "87"});
+        m.addRow(new String[] {"\"baunax\"", "34"});
+        m.addRow(new String[] {"\"diegoll\"", "87"});
         final String drl = p.marshal(m);
 		log.info("drl :\n{}", drl);
 		
@@ -229,8 +229,8 @@
         
         m.lhs[0] = fp;
         
-        m.addRow(new String[] {"baunax"});
-        m.addRow(new String[] {"diegoll"});
+        m.addRow(new String[] {"\"baunax\""});
+        m.addRow(new String[] {"\"diegoll\""});
         
         final String drl = p.marshal(m);
 		log.info("drl :\n{}", drl);