[jboss-svn-commits] JBL Code SVN: r11509 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/brms/server/util and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Apr 30 10:18:03 EDT 2007
Author: tirelli
Date: 2007-04-30 10:18:03 -0400 (Mon, 30 Apr 2007)
New Revision: 11509
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
JBRULES-647: infering attibute types for correct serialization
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/ActionFieldValue.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -9,18 +9,21 @@
implements
PortableObject {
+ public String field;
+ public String value;
+ public String type;
+
public ActionFieldValue(final String field,
- final String value) {
+ final String value,
+ final String type) {
this.field = field;
this.value = value;
+ this.type = type;
}
public ActionFieldValue() {
}
- public String field;
- public String value;
-
/**
* This will return true if the value is really a "formula" - in
* the sense of like an excel spreadsheet.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -1,5 +1,6 @@
package org.drools.brms.server.util;
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
import org.drools.brms.client.modeldriven.brxml.ActionAssertLogicalFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
@@ -348,10 +349,12 @@
buf.append( "( " );
if ( fieldValues[i].isFormula() ) {
buf.append( fieldValues[i].value.substring( 1 ) );
- } else {
+ } else if( SuggestionCompletionEngine.TYPE_STRING.equals( fieldValues[i].type ) ) {
buf.append( "\"" );
buf.append( fieldValues[i].value );
buf.append( "\"" );
+ } else {
+ buf.append( fieldValues[i].value );
}
buf.append( " );\n" );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionFieldValueTest.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -1,5 +1,6 @@
package org.drools.brms.modeldriven;
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
import junit.framework.TestCase;
@@ -8,10 +9,12 @@
public void testFormula() {
ActionFieldValue val = new ActionFieldValue( "x",
- "y" );
+ "y",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
assertFalse( val.isFormula() );
val = new ActionFieldValue( "x",
- "=y * 20" );
+ "=y * 20",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
assertTrue( val.isFormula() );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/modeldriven/ActionSetFieldTest.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -2,6 +2,7 @@
import junit.framework.TestCase;
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
@@ -11,9 +12,11 @@
final ActionSetField set = new ActionSetField();
set.fieldValues = new ActionFieldValue[2];
final ActionFieldValue v0 = new ActionFieldValue( "x",
- "42" );
+ "42",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
final ActionFieldValue v1 = new ActionFieldValue( "y",
- "43" );
+ "43",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
set.fieldValues[0] = v0;
set.fieldValues[1] = v1;
@@ -30,14 +33,17 @@
final ActionSetField set = new ActionSetField();
set.fieldValues = new ActionFieldValue[2];
final ActionFieldValue v0 = new ActionFieldValue( "x",
- "42" );
+ "42",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
final ActionFieldValue v1 = new ActionFieldValue( "y",
- "43" );
+ "43",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
set.fieldValues[0] = v0;
set.fieldValues[1] = v1;
final ActionFieldValue q = new ActionFieldValue( "q",
- "q" );
+ "q",
+ SuggestionCompletionEngine.TYPE_NUMERIC );
set.addFieldValue( q );
assertEquals( 3,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -2,6 +2,7 @@
import junit.framework.TestCase;
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
@@ -130,7 +131,8 @@
final ActionModifyField set = new ActionModifyField();
set.variable = "p1";
set.addFieldValue( new ActionFieldValue( "status",
- "rejected" ) );
+ "rejected",
+ SuggestionCompletionEngine.TYPE_STRING ) );
m.addRhsItem( set );
final ActionRetractFact ret = new ActionRetractFact( "p1" );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRXMLPersitenceTest.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -2,6 +2,7 @@
import junit.framework.TestCase;
+import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
import org.drools.brms.client.modeldriven.brxml.ActionAssertFact;
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
import org.drools.brms.client.modeldriven.brxml.ActionModifyField;
@@ -108,7 +109,8 @@
final ActionModifyField set = new ActionModifyField();
set.variable = "p1";
set.addFieldValue( new ActionFieldValue( "status",
- "rejected" ) );
+ "rejected",
+ SuggestionCompletionEngine.TYPE_STRING ) );
m.addRhsItem( set );
final ActionRetractFact ret = new ActionRetractFact( "p1" );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionAssertFactWidget.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -133,7 +133,9 @@
popup.addAttribute( "Add field", box );
box.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
- model.addFieldValue( new ActionFieldValue(box.getItemText( box.getSelectedIndex() ), "") );
+ String fieldName = box.getItemText( box.getSelectedIndex() );
+ String fieldType = completions.getFieldType( model.getType(), fieldName );
+ model.addFieldValue( new ActionFieldValue( fieldName, "", fieldType ) );
modeller.refreshWidget();
popup.hide();
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/ActionSetFieldWidget.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -132,7 +132,9 @@
popup.addAttribute( "Add field", box );
box.addChangeListener( new ChangeListener() {
public void onChange(Widget w) {
- model.addFieldValue( new ActionFieldValue(box.getItemText( box.getSelectedIndex() ), "") );
+ String fieldName = box.getItemText( box.getSelectedIndex() );
+ String fieldType = completions.getFieldType( model.getType(), fieldName );
+ model.addFieldValue( new ActionFieldValue( fieldName, "", fieldType ) );
modeller.refreshWidget();
popup.hide();
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-04-30 14:08:34 UTC (rev 11508)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-04-30 14:18:03 UTC (rev 11509)
@@ -962,7 +962,7 @@
FactPattern pattern = new FactPattern("Person");
pattern.boundName = "p";
ActionSetField action = new ActionSetField("p");
- ActionFieldValue value = new ActionFieldValue("age", "=42");
+ ActionFieldValue value = new ActionFieldValue("age", "42", SuggestionCompletionEngine.TYPE_NUMERIC );
action.addFieldValue( value );
model.addLhsItem( pattern );
More information about the jboss-svn-commits
mailing list