On branch java8

ponderosaTX · ponderosaTX · commit e6d9150e6ea1 · 2024-12-09T09:20:55.000-06:00
Changes to be committed:
	modified:   ../DefaultGlobalModel.java
	modified:   CompilerOptions.java

 Changed the compiler options to specify source and target are Java 8.
diff --git a/drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
@@ -182,9 +182,10 @@ public DefaultGlobalModel() {
     Iterable<? extends JDKToolsLibrary> tools = findLibraries();  // findLibraries should be called findTools
     List<CompilerInterface> compilers = new LinkedList<CompilerInterface>();
 
-    // TODO: should this be done a different way?
-    JavaxToolsCompiler javaxCompiler = new JavaxToolsCompiler();
-    compilers.add(javaxCompiler);
+    /* Removed in Java 8 version of DrJava */
+//    // TODO: should this be done a different way?
+//    JavaxToolsCompiler javaxCompiler = new JavaxToolsCompiler();
+//    compilers.add(javaxCompiler);
 
     /* Note: the only debugger used in DrJava is JPDADebugger in the DrJava code base which relies
      * on machinery provided by the tools.jar library included in every Java JDK (up through JDK 8).  A copy of the
@@ -357,15 +358,14 @@ private Iterable<JDKToolsLibrary> findLibraries() {
       else { JDKToolsLibrary.msg("\tduplicate"); }
     }
     
-    /* Removed when OPEN JDK 8 tools.jar (unjarred) was added to drjava.jar */
-//    // Only create a default JDKToolslibrary for the embedded tools.jar file if the list of results is otherwise empty.  
-//    
-//    if (results.isEmpty()) {
-//      JDKToolsLibrary defaultLibrary = 
-//        JarJDKToolsLibrary.makeFromFile(FileOps.getDrJavaFile(), this, JDKDescriptor.JDK_DEFAULT);
-//      JDKToolsLibrary.msg("Returning default library: " + defaultLibrary);
-//      return IterUtil.singleton(defaultLibrary);
-//    }
+//    /* Removed when OPEN JDK 8 tools.jar (unjarred) was added to drjava.jar */
+    // Only create a default JDKToolslibrary for the embedded tools.jar file if the list of results is otherwise empty.     
+    if (results.isEmpty()) {
+      JDKToolsLibrary defaultLibrary = 
+        JarJDKToolsLibrary.makeFromFile(FileOps.getDrJavaFile(), this, JDKDescriptor.JDK_DEFAULT);
+      JDKToolsLibrary.msg("Returning default library: " + defaultLibrary);
+      return IterUtil.singleton(defaultLibrary);
+    }
     
     // Add embedded tools.jar (unjarred) to libraries 
     JDKToolsLibrary defaultLibrary = JarJDKToolsLibrary.makeFromFile(FileOps.getDrJavaFile(), this, JDKDescriptor.JDK_DEFAULT);
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/CompilerOptions.java b/drjava/src/edu/rice/cs/drjava/model/compiler/CompilerOptions.java
@@ -103,6 +103,9 @@ public static HashMap<String,String> getOptions(boolean warningsEnabled) {
     }
     
     //Add any other options we want to add to the compiler in the future
+    options.put("-source", "8");
+    options.put("-target", "8");
+    
     return options;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,9 @@ public static HashMap<String,String> getOptions(boolean warningsEnabled) {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`//Add any other options we want to add to the compiler in the future`
	`106`	`+ options.put("-source", "8");`
	`107`	`+ options.put("-target", "8");`
	`108`	`+`
`106`	`109`	`return options;`
`107`	`110`	`}`
`108`	`111`	`}`