[jboss-svn-commits] JBL Code SVN: r13132 - labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/extractors.

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

Author: pombredanne
Date: 2007-07-05 20:16:49 -0400 (Thu, 05 Jul 2007)
New Revision: 13132

Modified:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldExtractor.java
Log:
Fix calls to ExpressionCompiler to use the new MVEL ParserContext

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldExtractor.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldExtractor.java	2007-07-06 00:15:48 UTC (rev 13131)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldExtractor.java	2007-07-06 00:16:49 UTC (rev 13132)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 JBoss Inc
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,16 +35,16 @@
 /**
  * A class field extractor that uses MVEL engine to extract the actual value for a given
  * expression. We use MVEL to resolve nested accessor expressions.
- * 
+ *
  * @author etirelli
  */
 public class MVELClassFieldExtractor extends BaseObjectClassFieldExtractor {
-    
+
     private static final long serialVersionUID = 400L;
 
     private CompiledExpression mvelExpression = null;
     private Map extractors = null;
-    private Map variables = null; 
+    private Map variables = null;
 
     public MVELClassFieldExtractor(Class clazz,
                                    String fieldName,
@@ -57,11 +57,11 @@
 
         ExpressionCompiler compiler = new ExpressionCompiler( fieldName );
         this.mvelExpression = compiler.compile();
-        
-        Set inputs = compiler.getInputs();
-        for( Iterator it = inputs.iterator(); it.hasNext(); ) {
+
+        Map<String, Class> inputs = compiler.getParserContextState().getInputs();
+        for( Iterator it = inputs.keySet().iterator(); it.hasNext(); ) {
             String basefield = (String) it.next();
-                        
+
             Extractor extr = ClassFieldExtractorCache.getExtractor(  clazz, basefield, classLoader );
             this.extractors.put( basefield, extr );
         }
@@ -75,7 +75,7 @@
             Map.Entry entry = (Map.Entry) it.next();
             String var = (String) entry.getKey();
             FieldExtractor extr = (FieldExtractor) entry.getValue();
-            
+
             this.variables.put( var, extr.getValue( workingMemory, object ));
         }
         return MVEL.executeExpression( mvelExpression, this.variables );