[jboss-svn-commits] JBL Code SVN: r31236 - in labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src: test/java/org/drools/guvnor/client/modeldriven and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 26 16:22:52 EST 2010
Author: baunax
Date: 2010-01-26 16:22:51 -0500 (Tue, 26 Jan 2010)
New Revision: 31236
Modified:
labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/ModelField.java
labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java
Log:
changed class to string
Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/ModelField.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/ModelField.java 2010-01-26 21:20:12 UTC (rev 31235)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/ModelField.java 2010-01-26 21:22:51 UTC (rev 31236)
@@ -1,6 +1,5 @@
package org.drools.guvnor.client.modeldriven;
-import java.io.Serializable;
import org.drools.guvnor.client.modeldriven.brl.PortableObject;
public class ModelField implements PortableObject {
@@ -30,7 +29,7 @@
* this clazz should be null.
* @param type the type of the clazz.
*/
- public ModelField(String name, Class clazz, String type) {
+ public ModelField(String name, String clazz, String type) {
this.name = name;
//if clazz==null it is considered as a Type Declaration
@@ -38,7 +37,7 @@
this.classType = FIELD_CLASS_TYPE.TYPE_DECLARATION_CLASS;
}else{
this.classType = FIELD_CLASS_TYPE.REGULAR_CLASS;
- this.className = clazz.getName();
+ this.className = clazz;
}
this.type = type;
Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java 2010-01-26 21:20:12 UTC (rev 31235)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java 2010-01-26 21:22:51 UTC (rev 31236)
@@ -46,7 +46,7 @@
SuggestionCompletionLoader loader = new SuggestionCompletionLoader();
- List enums = new ArrayList();
+ List<String> enums = new ArrayList<String>();
enums.add( "'Person.age' : [42, 43] \n 'Person.sex' : ['M', 'F']" );
enums.add( "'Driver.sex' : ['M', 'F']" );
@@ -61,7 +61,7 @@
assertEquals( 3,
engine.getDataEnumListsSize());
- String[] items = (String[]) engine.getDataEnumList( "Person.age" );
+ String[] items = engine.getDataEnumList( "Person.age" );
assertEquals( 2,
items.length );
assertEquals( "42",
@@ -92,7 +92,7 @@
SuggestionCompletionLoader loader = new SuggestionCompletionLoader();
- List enums = new ArrayList();
+ List<String> enums = new ArrayList<String>();
enums.add( "'Fact.field1' : ['val1', 'val2'] 'Fact.field2' : ['val3', 'val4'] 'Fact.field2[field1=val1]' : ['f1val1a', 'f1val1b'] 'Fact.field2[field1=val2]' : ['f1val2a', 'f1val2b']" );
@@ -110,7 +110,7 @@
assertEquals( 4,
engine.getDataEnumListsSize() );
- String[] items = (String[]) engine.getDataEnumList( "Fact.field2" );
+ String[] items = engine.getDataEnumList( "Fact.field2" );
assertEquals( 2,
items.length );
assertEquals( "val3",
@@ -130,7 +130,7 @@
assertEquals( "val4",
items[1] );
- items = (String[]) engine.getDataEnumList( "Fact.field1" );
+ items = engine.getDataEnumList( "Fact.field1" );
assertEquals( 2,
items.length );
assertEquals( "val1",
@@ -159,20 +159,20 @@
{
put( "Person",
new ModelField[]{
- new ModelField("age", Integer.class, "Numeric"),
- new ModelField("rank", Integer.class, "Comparable"),
- new ModelField("name", String.class, "String")
+ new ModelField("age", Integer.class.getName(), SuggestionCompletionEngine.TYPE_NUMERIC),
+ new ModelField("rank", Integer.class.getName(), SuggestionCompletionEngine.TYPE_COMPARABLE),
+ new ModelField("name", String.class.getName(), SuggestionCompletionEngine.TYPE_STRING)
} );
put( "Vehicle",
new ModelField[]{
- new ModelField("make", String.class, "String"),
- new ModelField("type", String.class, "String")
+ new ModelField("make", String.class.getName(), SuggestionCompletionEngine.TYPE_STRING),
+ new ModelField("type", String.class.getName(), SuggestionCompletionEngine.TYPE_STRING)
} );
}
});
- com.setGlobalVariables(new HashMap() {
+ com.setGlobalVariables(new HashMap<String, String>() {
{
put( "bar",
"Person" );
@@ -300,7 +300,7 @@
{
put( "Foo",
new ModelField[]{
- new ModelField("a", String.class, "String")
+ new ModelField("a", String.class.getName(), "String")
});
}
});
@@ -668,7 +668,7 @@
{
put( "Foo",
new ModelField[]{
- new ModelField("a", String.class, "String")
+ new ModelField("a", String.class.getName(), "String")
});
}
});
Modified: labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java
===================================================================
--- labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java 2010-01-26 21:20:12 UTC (rev 31235)
+++ labs/jbossrules/branches/guvnor_expressionEditor2_baunax_esteban/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/dt/GuidedDecisionTableTest.java 2010-01-26 21:22:51 UTC (rev 31236)
@@ -208,8 +208,8 @@
{
put("Driver",
new ModelField[]{
- new ModelField("age", Integer.class, SuggestionCompletionEngine.TYPE_NUMERIC),
- new ModelField("name", String.class, SuggestionCompletionEngine.TYPE_STRING)
+ new ModelField("age", Integer.class.getName(), SuggestionCompletionEngine.TYPE_NUMERIC),
+ new ModelField("name", String.class.getName(), SuggestionCompletionEngine.TYPE_STRING)
});
}
});
@@ -326,8 +326,8 @@
{
put("Driver",
new ModelField[]{
- new ModelField("age", Integer.class, SuggestionCompletionEngine.TYPE_NUMERIC),
- new ModelField("name", String.class, SuggestionCompletionEngine.TYPE_STRING)
+ new ModelField("age", Integer.class.getName(), SuggestionCompletionEngine.TYPE_NUMERIC),
+ new ModelField("name", String.class.getName(), SuggestionCompletionEngine.TYPE_STRING)
});
}
});
More information about the jboss-svn-commits
mailing list