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

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

Author: eaa
Date: 2010-01-27 14:51:57 -0500 (Wed, 27 Jan 2010)
New Revision: 31267

Modified:
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java
   labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java
Log:
Guided Editor:
	Field Constraint now support expression builder on right side

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java	2010-01-27 19:50:51 UTC (rev 31266)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/ISingleFieldConstraint.java	2010-01-27 19:51:57 UTC (rev 31267)
@@ -32,6 +32,11 @@
     public static final int TYPE_RET_VALUE = 3;
 
     /**
+     * This is for a "expression builder" that calculates a value.
+     */
+    public static final int TYPE_EXPR_BUILDER = 6;
+
+    /**
      * This is not used yet. ENUMs are not suitable for business rules
      * until we can get data driven non code enums.
      */

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java	2010-01-27 19:50:51 UTC (rev 31266)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/SingleFieldConstraint.java	2010-01-27 19:51:57 UTC (rev 31267)
@@ -15,6 +15,11 @@
     public String                 fieldType;
     public FieldConstraint  parent;
 
+    /**
+     * Used instead of "value" when constraintValueType = TYPE_EXPR_BUILDER
+     */
+    private ExpressionFormLine expression = new ExpressionFormLine();
+
     public ConnectiveConstraint[] connectives;
 
     public SingleFieldConstraint(final String field, final String fieldType, final FieldConstraint parent) {
@@ -63,4 +68,14 @@
         }
     }
 
+    public ExpressionFormLine getExpression() {
+        return expression;
+    }
+
+    public void setExpression(ExpressionFormLine expression) {
+        this.expression = expression;
+    }
+
+    
+
 }

Modified: labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java	2010-01-27 19:50:51 UTC (rev 31266)
+++ labs/jbossrules/branches/guvnor_expressionEditor3_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/server/util/BRDRLPersistence.java	2010-01-27 19:51:57 UTC (rev 31267)
@@ -379,7 +379,7 @@
                     buf.append(" : ");
                 }
                 if ((constr.operator != null && constr.value != null)
-                        || constr.fieldBinding != null) {
+                        || constr.fieldBinding != null || constr.constraintValueType == ISingleFieldConstraint.TYPE_EXPR_BUILDER) {
                     SingleFieldConstraint parent = (SingleFieldConstraint) constr.parent;
                     StringBuilder parentBuf = new StringBuilder();
                     while (parent != null) {
@@ -391,21 +391,22 @@
                 }
 
                 addFieldRestriction(buf, constr.constraintValueType,
-                        constr.operator, constr.value);
+                        constr.operator, constr.value,constr.getExpression());
 
                 // and now do the connectives.
                 if (constr.connectives != null) {
                     for (int j = 0; j < constr.connectives.length; j++) {
                         final ConnectiveConstraint conn = constr.connectives[j];
                         addFieldRestriction(buf, conn.constraintValueType,
-                                conn.operator, conn.value);
+                                conn.operator, conn.value,null);
                     }
                 }
             }
         }
 
         private void addFieldRestriction(final StringBuilder buf,
-                final int type, final String operator, final String value) {
+                final int type, final String operator, final String value,
+                final ExpressionFormLine expression) {
             if (operator == null) {
                 return;
             }
@@ -428,6 +429,11 @@
                         buf.append('"');
                     }
                     break;
+                case ISingleFieldConstraint.TYPE_EXPR_BUILDER:
+                    if (expression!=null){
+                        buf.append(expression.getText());
+                    }
+                    break;
                 default:
                     buf.append(value);
             }