# HG changeset patch
# User wenzelm
# Date 1335356667 -7200
# Node ID de249b5ae6e22eaee40e353b0cdfe379ce0c38f0
# Parent  af81dc62a281d667000afd54f2d70bde9a401252
back to mature jdk1.6.0_31, to avoid issues like Sidekick TAB completion and generic ListCellRenderer;

diff -r af81dc62a281 -r de249b5ae6e2 Admin/java/README
--- a/Admin/java/README	Wed Apr 25 14:19:53 2012 +0200
+++ b/Admin/java/README	Wed Apr 25 14:24:27 2012 +0200
@@ -1,3 +1,3 @@
-This is JDK 1.7.0_03 for Linux from
+This is JDK 1.6.0_31 for Linux from
 http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
diff -r af81dc62a281 -r de249b5ae6e2 Admin/java/etc/settings
--- a/Admin/java/etc/settings	Wed Apr 25 14:19:53 2012 +0200
+++ b/Admin/java/etc/settings	Wed Apr 25 14:24:27 2012 +0200
@@ -1,4 +1,4 @@
 # -*- shell-script -*- :mode=shellscript:
 
-ISABELLE_JDK_HOME="$COMPONENT/jdk1.7.0_03"
+ISABELLE_JDK_HOME="$COMPONENT/jdk1.6.0_31"
 
diff -r af81dc62a281 -r de249b5ae6e2 Admin/launch4j/isabelle.xml
--- a/Admin/launch4j/isabelle.xml	Wed Apr 25 14:19:53 2012 +0200
+++ b/Admin/launch4j/isabelle.xml	Wed Apr 25 14:24:27 2012 +0200
@@ -20,7 +20,7 @@
     <cp>lib\classes\ext\scala-swing.jar</cp>
   </classPath>
   <jre>
-    <path>contrib\jdk-7u3_x86-cygwin\jdk1.7.0_03</path>
+    <path>contrib\jdk-6u31_x86-cygwin\jdk1.6.0_31</path>
     <minVersion></minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>jdkOnly</jdkPreference>
diff -r af81dc62a281 -r de249b5ae6e2 README
--- a/README	Wed Apr 25 14:19:53 2012 +0200
+++ b/README	Wed Apr 25 14:24:27 2012 +0200
@@ -16,7 +16,7 @@
      * The Poly/ML compiler and runtime system (version 5.2.1 or later).
      * The GNU bash shell (version 3.x or 2.x).
      * Perl (version 5.x).
-     * Java 1.6.x or 1.7.x from Oracle or Apple -- for Scala and jEdit.
+     * Java 1.6.x from Oracle or Apple -- for Scala and jEdit.
      * GNU Emacs (version 23 or 24) -- for the Proof General 4.x interface.
      * A complete LaTeX installation -- for document preparation.
 
diff -r af81dc62a281 -r de249b5ae6e2 src/HOL/Tools/Nitpick/nitpick.ML
--- a/src/HOL/Tools/Nitpick/nitpick.ML	Wed Apr 25 14:19:53 2012 +0200
+++ b/src/HOL/Tools/Nitpick/nitpick.ML	Wed Apr 25 14:24:27 2012 +0200
@@ -180,7 +180,7 @@
                (length ts downto 1) ts))]
 
 fun install_java_message () =
-  "Nitpick requires Java Development Kit 1.6/1.7 via ISABELLE_JDK_HOME setting."
+  "Nitpick requires Java Development Kit 1.6 via ISABELLE_JDK_HOME setting."
 fun install_kodkodi_message () =
   "Nitpick requires the external Java program Kodkodi. To install it, download \
   \the package from \"http://www21.in.tum.de/~blanchet/#software\" and add the \
diff -r af81dc62a281 -r de249b5ae6e2 src/Tools/jEdit/README_BUILD
--- a/src/Tools/jEdit/README_BUILD	Wed Apr 25 14:19:53 2012 +0200
+++ b/src/Tools/jEdit/README_BUILD	Wed Apr 25 14:24:27 2012 +0200
@@ -1,10 +1,10 @@
 Requirements for instantaneous build from sources
 =================================================
 
-* Official Java JDK 1.6/1.7 from Sun/Oracle/Apple
+* Official Java JDK 1.6 from Sun/Oracle/Apple
   http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
-  (or OpenJDK 1.7, but not OpenJDK 1.6)
+  (experimental support for JDK/OpenJDK 1.7, but not OpenJDK 1.6)
 
 * Scala 2.9.2 (or 2.8.2.final)
   http://www.scala-lang.org