[jboss-svn-commits] JBL Code SVN: r23115 - in labs/jbossrules/trunk: drools-core/src/main/java/org/drools/base/mvel and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 26 20:42:50 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-09-26 20:42:50 -0400 (Fri, 26 Sep 2008)
New Revision: 23115
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
Log:
-moved MVELDateCoercion to be initialised on the MVELCompilatoinUnit
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-09-26 19:35:39 UTC (rev 23114)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-09-27 00:42:50 UTC (rev 23115)
@@ -90,7 +90,7 @@
private Map<String, PackageRegistry> pkgRegistryMap;
- private List<DroolsError> results;
+ private List<DroolsError> results;
private PackageBuilderConfiguration configuration;
@@ -112,7 +112,7 @@
private final String defaultDialect;
private CompositeClassLoader rootClassLoader;
-
+
private Map<String, Class> globals;
/**
@@ -213,7 +213,7 @@
pkgRegistry.setDialect( this.defaultDialect );
this.pkgRegistryMap.put( pkg.getName(),
pkgRegistry );
-
+
globals = new HashMap<String, Class>();
}
@@ -238,7 +238,7 @@
this.results = new ArrayList();
this.ruleBase = (ReteooRuleBase) ruleBase;
-
+
globals = new HashMap<String, Class>();
}
@@ -364,12 +364,12 @@
if ( !isEmpty( packageDescr.getNamespace() ) ) {
// use the default namespace
- if (checkNamespace(packageDescr.getNamespace())) {
- this.defaultNamespace = packageDescr.getNamespace();
- } else {
- //force the default.
- packageDescr.setNamespace(this.defaultNamespace);
- }
+ if ( checkNamespace( packageDescr.getNamespace() ) ) {
+ this.defaultNamespace = packageDescr.getNamespace();
+ } else {
+ //force the default.
+ packageDescr.setNamespace( this.defaultNamespace );
+ }
} else {
// packagedescr defines a new default namespace
packageDescr.setNamespace( this.defaultNamespace );
@@ -453,21 +453,20 @@
}
}
}
-
+
/**
* This checks to see if it should all be in the one namespace.
*/
private boolean checkNamespace(String newName) {
- if (this.configuration == null) return true;
- if (this.defaultNamespace == null) return true;
- if (this.defaultNamespace.equals(newName)) return true;
+ if ( this.configuration == null ) return true;
+ if ( this.defaultNamespace == null ) return true;
+ if ( this.defaultNamespace.equals( newName ) ) return true;
return this.configuration.isAllowMultipleNamespaces();
}
public boolean isEmpty(String string) {
return (string == null || string.trim().length() == 0);
}
-
public void updateResults() {
// some of the rules and functions may have been redefined
@@ -528,7 +527,7 @@
// define a new package
pkg = new Package( packageDescr.getName() );
pkg.setClassFieldAccessorCache( new ClassFieldAccessorCache( this.rootClassLoader ) );
-
+
// if there is a rulebase then add the package.
if ( this.ruleBase != null ) {
this.ruleBase.addPackage( pkg );
@@ -586,7 +585,8 @@
clazz = pkgRegistry.getTypeResolver().resolveType( className );
pkgRegistry.getPackage().addGlobal( identifier,
clazz );
- this.globals.put( identifier, clazz );
+ this.globals.put( identifier,
+ clazz );
} catch ( final ClassNotFoundException e ) {
this.results.add( new GlobalError( identifier,
global.getLine() ) );
@@ -720,7 +720,8 @@
ClassDefinition cd = type.getTypeClassDef();
ClassFieldAccessorStore store = pkgRegistry.getPackage().getClassFieldAccessorStore();
for ( FieldDefinition attrDef : cd.getFieldsDefinitions() ) {
- ClassFieldAccessor accessor = store.getAccessor( cd.getDefinedClass().getName(), attrDef.getName() );
+ ClassFieldAccessor accessor = store.getAccessor( cd.getDefinedClass().getName(),
+ attrDef.getName() );
attrDef.setReadWriteAccessor( accessor );
}
}
@@ -896,7 +897,7 @@
public Map<String, PackageRegistry> getPackageRegistry() {
return this.pkgRegistryMap;
}
-
+
public Map<String, Class> getGlobals() {
return this.globals;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-09-26 19:35:39 UTC (rev 23114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-09-27 00:42:50 UTC (rev 23115)
@@ -53,14 +53,6 @@
private Map localVariables;
- static {
- //for handling dates as string literals
- DataConversion.addConversionHandler(Date.class,
- new MVELDateCoercion());
- DataConversion.addConversionHandler(Calendar.class,
- new MVELCalendarCoercion());
- }
-
public DroolsMVELFactory() {
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java 2008-09-26 19:35:39 UTC (rev 23114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java 2008-09-27 00:42:50 UTC (rev 23115)
@@ -43,14 +43,6 @@
private Map localVariables;
- static {
- //for handling dates as string literals
- DataConversion.addConversionHandler( Date.class,
- new MVELDateCoercion() );
- DataConversion.addConversionHandler( Calendar.class,
- new MVELCalendarCoercion() );
- }
-
public DroolsProcessMVELFactory() {
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java 2008-09-26 19:35:39 UTC (rev 23114)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java 2008-09-27 00:42:50 UTC (rev 23115)
@@ -7,6 +7,8 @@
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import java.util.Calendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -18,6 +20,7 @@
import org.drools.base.ModifyInterceptor;
import org.drools.rule.Declaration;
import org.drools.spi.KnowledgeHelper;
+import org.mvel.DataConversion;
import org.mvel.Macro;
import org.mvel.ParserContext;
import org.mvel.compiler.AbstractParser;
@@ -53,6 +56,14 @@
interceptors.put( "Modify",
new ModifyInterceptor() );
}
+
+ static {
+ //for handling dates as string literals
+ DataConversion.addConversionHandler( Date.class,
+ new MVELDateCoercion() );
+ DataConversion.addConversionHandler( Calendar.class,
+ new MVELCalendarCoercion() );
+ }
private static final Map<String, Class> primitivesMap = new HashMap<String, Class>();
static {
More information about the jboss-svn-commits
mailing list