DrJavaAtRice
diff --git a/‎drjava/lib/javalanglevels-base.jar‎
0 Bytes b/‎drjava/lib/javalanglevels-base.jar‎
0 Bytes
diff --git a/‎drjava/lib/platform.jar‎
3.75 KB b/‎drjava/lib/platform.jar‎
3.75 KB
diff --git a/‎drjava/lib/plt.jar‎
-1 Bytes b/‎drjava/lib/plt.jar‎
-1 Bytes
diff --git a/‎drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java‎
Lines changed: 8 additions & 2 deletions b/‎drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎dynamicjava/lib/plt.jar‎
-1 Bytes b/‎dynamicjava/lib/plt.jar‎
-1 Bytes
diff --git a/‎javalanglevels/lib/plt.jar‎
-1 Bytes b/‎javalanglevels/lib/plt.jar‎
-1 Bytes
diff --git a/‎platform/build.xml‎
Lines changed: 3 additions & 3 deletions b/‎platform/build.xml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$1.class‎
788 Bytes b/‎platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$1.class‎
788 Bytes
diff --git a/‎platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$OurLog.class‎
2.96 KB b/‎platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$OurLog.class‎
2.96 KB
diff --git a/‎platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler.class‎
4.23 KB b/‎platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler.class‎
4.23 KB
@@ -488,6 +488,10 @@ public static Iterable<JarJDKToolsLibrary> search(GlobalModel model) {
           if (mapToAddTo.containsKey(v)) { mapToAddTo.put(v, IterUtil.compose(lib, mapToAddTo.get(v))); }
           else { mapToAddTo.put(v, IterUtil.singleton(lib)); }
         }
+        else {
+          JDKToolsLibrary.msg("\tlibrary is not valid: compiler="+lib.compiler().isAvailable()+
+                              " debugger="+lib.debugger().isAvailable()+" javadoc="+lib.javadoc().isAvailable());
+        }
       }
     }
 
@@ -509,7 +513,8 @@ public static Iterable<JarJDKToolsLibrary> search(GlobalModel model) {
         if ((javaVersion.majorVersion().equals(compoundVersion.majorVersion())) &&
             (javaVersion.maintenance()==compoundVersion.maintenance()) &&
             (javaVersion.update()==compoundVersion.update()) &&
-            (javaVersion.release()==compoundVersion.release())) {
+            (javaVersion.release()==compoundVersion.release()) &&
+            (javaVersion.supports(compoundLib.jdkDescriptor().getMinimumMajorVersion()))) {
           JDKToolsLibrary.msg("\t\tfound");
           found = javaLib;
           break;
@@ -520,7 +525,8 @@ public static Iterable<JarJDKToolsLibrary> search(GlobalModel model) {
         for(JarJDKToolsLibrary javaLib: collapsed) {
           JDKToolsLibrary.msg("\tmajor? "+javaLib.version());
           FullVersion javaVersion = javaLib.version();
-          if (javaVersion.majorVersion().equals(compoundVersion.majorVersion())) {
+          if (javaVersion.majorVersion().equals(compoundVersion.majorVersion()) &&
+              javaVersion.supports(compoundLib.jdkDescriptor().getMinimumMajorVersion())) {
             JDKToolsLibrary.msg("\t\tfound");
             found = javaLib;
             break;
 
@@ -367,8 +367,8 @@
     <antcall target="iterate-tests">
       <param name="platform-tag" value="nextgen" />
       <param name="extra-classpath" value="${nextgen-tools}" />
-<!--      <param name="test-jvm" value="${nextgen-exec}" /> --> <!-- TODO -->
-      <param name="test-jvm" value="${java6-exec}" />
+      <param name="test-jvm" value="${nextgen-exec}" /> <!-- TODO -->
+<!--      <param name="test-jvm" value="${java6-exec}" /> -->
     </antcall>
   </target>
 
@@ -1013,7 +1013,7 @@
     <if>
       <not><isset property="nextgen-exec" /></not>
       <then>
-        <property name="nextgen-exec-2" location="${nextgen-home}/langtools/bin/nextgen" />
+        <property name="nextgen-exec-2" location="${nextgen-home}/bin/nextgen" />
         <available property="nextgen-exec" value="${nextgen-exec-2}" file="${nextgen-exec-2}" />
       </then>
     </if>