[jboss-svn-commits] JBL Code SVN: r32495 - labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt.

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

Author: baunax
Date: 2010-04-09 17:14:41 -0400 (Fri, 09 Apr 2010)
New Revision: 32495

Modified:
   labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java
Log:
fixed for support duplicated variables

Modified: labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java
===================================================================
--- labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java	2010-04-09 20:59:18 UTC (rev 32494)
+++ labs/jbossrules/branches/guvnor_rules_templates_baunax_esteban_diega/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/dt/TemplateModel.java	2010-04-09 21:14:41 UTC (rev 32495)
@@ -1,8 +1,6 @@
 package org.drools.guvnor.client.modeldriven.dt;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,7 +90,7 @@
                 for (FieldConstraint fc : fact.getFieldConstraints()) {
                     if (fc instanceof ISingleFieldConstraint) {
                         ISingleFieldConstraint con = (ISingleFieldConstraint) fc;
-                        if (ISingleFieldConstraint.TYPE_TEMPLATE == con.constraintValueType) {
+                        if (ISingleFieldConstraint.TYPE_TEMPLATE == con.constraintValueType && !result.containsKey(con.value)) {
                             result.put(con.value, result.size());
                         }
                     }
@@ -103,7 +101,7 @@
             if (action instanceof ActionInsertFact) {
                 ActionInsertFact fact = (ActionInsertFact) action;
                 for (ActionFieldValue afv : fact.fieldValues) {
-                	if (afv.nature == ActionFieldValue.TYPE_TEMPLATE ) {
+                	if (afv.nature == ActionFieldValue.TYPE_TEMPLATE && !result.containsKey(afv.value)) {
                 		result.put(afv.value, result.size());
                 	}
                 }