# HG changeset patch
# User wenzelm
# Date 1345119958 -7200
# Node ID b19ba23e70c5779063fa37db1c9b9076766bb64a
# Parent  3a9721d4ccae4119b087ac46b222c69e5a76b548
updated to jdk-7u6 and jedit_build-20120813 -- NB: plain Isabelle/Scala still happens to work with jdk-6;

diff -r 3a9721d4ccae -r b19ba23e70c5 Admin/components
--- a/Admin/components	Thu Aug 16 14:05:50 2012 +0200
+++ b/Admin/components	Thu Aug 16 14:25:58 2012 +0200
@@ -4,9 +4,10 @@
 contrib/hol-light-bundle-0.5-126
 contrib/kodkodi-1.2.16
 contrib/spass-3.8ds
-contrib/scala-2.9.2
 contrib/vampire-1.0
 contrib/yices-1.0.28
 contrib/z3-4.0
-contrib/jedit_build-20120414
-contrib/jdk-6u31
+contrib/jdk-7u6
+contrib/scala-2.9.2
+contrib/jedit_build-20120813
+
diff -r 3a9721d4ccae -r b19ba23e70c5 src/Tools/jEdit/README_BUILD
--- a/src/Tools/jEdit/README_BUILD	Thu Aug 16 14:05:50 2012 +0200
+++ b/src/Tools/jEdit/README_BUILD	Thu Aug 16 14:25:58 2012 +0200
@@ -1,28 +1,22 @@
-Requirements for instantaneous build from sources
-=================================================
+Requirements for instantaneous build from repository
+====================================================
 
-* Official Java JDK 1.6 from Sun/Oracle/Apple
+* Java JDK 1.7 from Oracle
   http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
-  (experimental support for JDK/OpenJDK 1.7, but not OpenJDK 1.6)
+  (experimental support for JDK/OpenJDK 1.7)
 
 * Scala 2.9.2
   http://www.scala-lang.org
 
   (experimental support for Scala 2.10.x milestones)
 
+  Note that the official directory layout of JDK and Scala is required!
+
 * Auxiliary jedit_build component
-  http://www4.in.tum.de/~wenzelm/test/jedit_build-20120414.tar.gz
 
 
-Important settings within Isabelle environment
-==============================================
-
-* init_component ".../jedit_build-20120414"
-* ISABELLE_JDK_HOME
-* SCALA_HOME
-
-Note that the official directory layout of JDK and Scala is required!
+See also http://isabelle.in.tum.de/components/.
 
 
 Build and run
diff -r 3a9721d4ccae -r b19ba23e70c5 src/Tools/jEdit/src/isabelle_sidekick.scala
--- a/src/Tools/jEdit/src/isabelle_sidekick.scala	Thu Aug 16 14:05:50 2012 +0200
+++ b/src/Tools/jEdit/src/isabelle_sidekick.scala	Thu Aug 16 14:25:58 2012 +0200
@@ -110,11 +110,12 @@
               else
                 new SideKickCompletion(pane.getView, word, ds.toArray.asInstanceOf[Array[Object]]) {
                   override def getRenderer() =
-                    new ListCellRenderer {
-                      val default_renderer = new DefaultListCellRenderer
+                    new ListCellRenderer[Any] {
+                      val default_renderer =
+                        (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
 
                       override def getListCellRendererComponent(
-                          list: JList, value: Any, index: Int,
+                          list: JList[_ <: Any], value: Any, index: Int,
                           selected: Boolean, focus: Boolean): Component =
                       {
                         val renderer: Component =