[jboss-svn-commits] JBL Code SVN: r10690 - in labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools: compiler and 1 other directories.

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

Author: mark.proctor at jboss.com
Date: 2007-04-01 23:42:28 -0400 (Sun, 01 Apr 2007)
New Revision: 10690

Removed:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/dialect/
Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
Log:
JBRULES-769 NullPointer in Outline view
-There was a missmash in settings, so corrected.
-src/target language level configuration wasn't correct, so fixed.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2007-04-02 02:59:31 UTC (rev 10689)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java	2007-04-02 03:42:28 UTC (rev 10690)
@@ -39,11 +39,11 @@
 
     public static final String[] LANGUAGE_LEVELS           = new String[]{"1.4", "1.5", "1.6"};
     public static final String   DEFAULT_LANGUAGE_LEVEL    = "1.4";
-    
+
     /** These will be only setup once. It tries to look for a system property */
     private static final int     CONFIGURED_COMPILER       = getDefaultCompiler();
     private static final String  CONFIGURED_LANGUAGE_LEVEL = getDefaultLanguageLevel();
-    
+
     private int                  compiler                  = PackageBuilderConfiguration.CONFIGURED_COMPILER;
 
     private ClassLoader          classLoader;
@@ -64,10 +64,8 @@
 
     public String getJavaLanguageLevel() {
         if ( languageLevel != null ) return languageLevel;
-        languageLevel = System.getProperty( "drools.compiler.lnglevel",
-                                            DEFAULT_LANGUAGE_LEVEL );
-        if ( Arrays.binarySearch( LANGUAGE_LEVELS,
-                                  languageLevel ) < 0 ) throw new RuntimeDroolsException( "value '" + languageLevel + "' is not a valid language level" );
+        setJavaLanguageLevel( System.getProperty( "drools.compiler.lnglevel",
+                                                  DEFAULT_LANGUAGE_LEVEL ) );
         return languageLevel;
     }
 
@@ -76,10 +74,8 @@
      * @param level
      */
     public void setJavaLanguageLevel(String level) {
-        if ( level.equals( "1.4" ) ) {
-            // can't set to 1.4, as we need static imports
-            level = "1.5";
-        }
+        if ( Arrays.binarySearch( LANGUAGE_LEVELS,
+                                  languageLevel ) < 0 ) throw new RuntimeDroolsException( "value '" + languageLevel + "' is not a valid language level" );
         languageLevel = level;
     }
 
@@ -145,13 +141,9 @@
             }
 
             return languageLevel;
-        } catch ( Exception e) {
-            e.printStackTrace();
-            return "1.4";
+        } catch ( Exception e ) {
+            System.err.println( "Drools config: unable to read the drools.compiler.lnglevel property. Using default." );
+            return DEFAULT_LANGUAGE_LEVEL;
         }
-//        } catch ( final SecurityException e ) {
-//            System.err.println( "Drools config: unable to read the drools.compiler.lnglevel property. Using default." );
-//            return "1.4";
-//        }
     }
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-04-02 02:59:31 UTC (rev 10689)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-04-02 03:42:28 UTC (rev 10690)
@@ -370,12 +370,16 @@
             default : {
                 final EclipseJavaCompilerSettings eclipseSettings = new EclipseJavaCompilerSettings();
                 Map map = eclipseSettings.getMap();
+                String lngLevel = this.configuration.getJavaLanguageLevel();
                 map.put( CompilerOptions.OPTION_TargetPlatform,
-                         this.configuration.getJavaLanguageLevel() );
+                         lngLevel );
 
-                // We now default this to 1.5, so we can use static imports.
+                if ( lngLevel == "1.4" ) {
+                    // 1.5 is the minimum for source langauge level, so we can use static imports.
+                    lngLevel = "1.5";
+                }
                 map.put( CompilerOptions.OPTION_Source,
-                         "1.5" );
+                         lngLevel );
                 this.compiler = new EclipseJavaCompiler( map );
                 break;
             }