[jboss-svn-commits] JBL Code SVN: r20101 - labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse.

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

Author: KrisVerlaenen
Date: 2008-05-21 08:46:14 -0400 (Wed, 21 May 2008)
New Revision: 20101

Modified:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
Log:
JBRULES-1614: PackageBuilder does not take configuration files in the user classpath into account
 - PackageBuilderConfiguration is now created after switching the classloader

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java	2008-05-21 12:36:55 UTC (rev 20100)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java	2008-05-21 12:46:14 UTC (rev 20101)
@@ -319,17 +319,20 @@
             Reader dslReader = DSLAdapter.getDSLContent(content, resource);
             ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
             ClassLoader newLoader = DroolsBuilder.class.getClassLoader();
-            PackageBuilderConfiguration builder_configuration = new PackageBuilderConfiguration();
+            String level = null;
             if (resource.getProject().getNature("org.eclipse.jdt.core.javanature") != null) {
                 IJavaProject project = JavaCore.create(resource.getProject());
                 newLoader = ProjectClassLoader.getProjectClassLoader(project);
-                String level = project.getOption(JavaCore.COMPILER_COMPLIANCE, true);
-                JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder_configuration.getDialectConfiguration( "java" );
-                javaConf.setJavaLanguageLevel(level);
+                level = project.getOption(JavaCore.COMPILER_COMPLIANCE, true);
             }
             try {
-            	builder_configuration.setClassLoader(newLoader);
                 Thread.currentThread().setContextClassLoader(newLoader);
+                PackageBuilderConfiguration builder_configuration = new PackageBuilderConfiguration();
+                if (level != null) {
+	                JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder_configuration.getDialectConfiguration( "java" );
+	                javaConf.setJavaLanguageLevel(level);
+                }
+                builder_configuration.setClassLoader(newLoader);
 
                 // first parse the source
                 PackageDescr packageDescr = null;