1.1 --- a/Admin/components	Thu Aug 16 14:05:50 2012 +0200
     1.2 +++ b/Admin/components	Thu Aug 16 14:25:58 2012 +0200
     1.3 @@ -4,9 +4,10 @@
     1.4  contrib/hol-light-bundle-0.5-126
     1.5  contrib/kodkodi-1.2.16
     1.6  contrib/spass-3.8ds
     1.7 -contrib/scala-2.9.2
     1.8  contrib/vampire-1.0
     1.9  contrib/yices-1.0.28
    1.10  contrib/z3-4.0
    1.11 -contrib/jedit_build-20120414
    1.12 -contrib/jdk-6u31
    1.13 +contrib/jdk-7u6
    1.14 +contrib/scala-2.9.2
    1.15 +contrib/jedit_build-20120813
    1.16 +

     2.1 --- a/src/Tools/jEdit/README_BUILD	Thu Aug 16 14:05:50 2012 +0200
     2.2 +++ b/src/Tools/jEdit/README_BUILD	Thu Aug 16 14:25:58 2012 +0200
     2.3 @@ -1,28 +1,22 @@
     2.4 -Requirements for instantaneous build from sources
     2.5 -=================================================
     2.6 +Requirements for instantaneous build from repository
     2.7 +====================================================
     2.8  
     2.9 -* Official Java JDK 1.6 from Sun/Oracle/Apple
    2.10 +* Java JDK 1.7 from Oracle
    2.11    http://www.oracle.com/technetwork/java/javase/downloads/index.html
    2.12  
    2.13 -  (experimental support for JDK/OpenJDK 1.7, but not OpenJDK 1.6)
    2.14 +  (experimental support for JDK/OpenJDK 1.7)
    2.15  
    2.16  * Scala 2.9.2
    2.17    http://www.scala-lang.org
    2.18  
    2.19    (experimental support for Scala 2.10.x milestones)
    2.20  
    2.21 +  Note that the official directory layout of JDK and Scala is required!
    2.22 +
    2.23  * Auxiliary jedit_build component
    2.24 -  http://www4.in.tum.de/~wenzelm/test/jedit_build-20120414.tar.gz
    2.25  
    2.26  
    2.27 -Important settings within Isabelle environment
    2.28 -==============================================
    2.29 -
    2.30 -* init_component ".../jedit_build-20120414"
    2.31 -* ISABELLE_JDK_HOME
    2.32 -* SCALA_HOME
    2.33 -
    2.34 -Note that the official directory layout of JDK and Scala is required!
    2.35 +See also http://isabelle.in.tum.de/components/.
    2.36  
    2.37  
    2.38  Build and run

     3.1 --- a/src/Tools/jEdit/src/isabelle_sidekick.scala	Thu Aug 16 14:05:50 2012 +0200
     3.2 +++ b/src/Tools/jEdit/src/isabelle_sidekick.scala	Thu Aug 16 14:25:58 2012 +0200
     3.3 @@ -110,11 +110,12 @@
     3.4                else
     3.5                  new SideKickCompletion(pane.getView, word, ds.toArray.asInstanceOf[Array[Object]]) {
     3.6                    override def getRenderer() =
     3.7 -                    new ListCellRenderer {
     3.8 -                      val default_renderer = new DefaultListCellRenderer
     3.9 +                    new ListCellRenderer[Any] {
    3.10 +                      val default_renderer =
    3.11 +                        (new DefaultListCellRenderer).asInstanceOf[ListCellRenderer[Any]]
    3.12  
    3.13                        override def getListCellRendererComponent(
    3.14 -                          list: JList, value: Any, index: Int,
    3.15 +                          list: JList[_ <: Any], value: Any, index: Int,
    3.16                            selected: Boolean, focus: Boolean): Component =
    3.17                        {
    3.18                          val renderer: Component =