# HG changeset patch
# User wenzelm
# Date 1378479709 -7200
# Node ID 5bef05f5ed5848bd0681594c097cdb3453cf6fd0
# Parent  ef2bb63583aca8165fdf9f8710f8a020889829f2
prefer warm start via JEdit_Main;

diff -r ef2bb63583ac -r 5bef05f5ed58 src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Fri Sep 06 15:47:51 2013 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Fri Sep 06 17:01:49 2013 +0200
@@ -214,16 +214,24 @@
 JEDIT_JAR="$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/jedit.jar"
 
 JEDIT_JARS=(
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/Console.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/ErrorList.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/Highlight.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/SideKick.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/cobra.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/js.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/idea-icons.jar"
-  "$ISABELLE_JEDIT_BUILD_HOME/contrib/jsr305-2.0.0.jar"
+  "Console.jar"
+  "ErrorList.jar"
+  "Highlight.jar"
+  "SideKick.jar"
+  "cobra.jar"
+  "js.jar"
+  "idea-icons.jar"
+  "jsr305-2.0.0.jar"
 )
 
+declare -a JEDIT_BUILD_JARS=()
+declare -a JEDIT_STARTUP_JARS=()
+for NAME in "${JEDIT_JARS[@]}"
+do
+  JEDIT_BUILD_JARS["${#JEDIT_BUILD_JARS[@]}"]="$ISABELLE_JEDIT_BUILD_HOME/contrib/$NAME"
+  JEDIT_STARTUP_JARS["${#JEDIT_STARTUP_JARS[@]}"]="$JEDIT_HOME/dist/jars/$NAME"
+done
+
 declare -a JFREECHART_JARS=()
 for NAME in $JFREECHART_JAR_NAMES
 do
@@ -246,7 +254,7 @@
   else
     if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
       declare -a DEPS=(
-        "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}" "$XZ_JAVA_HOME/lib/xz.jar"
+        "$JEDIT_JAR" "${JEDIT_BUILD_JARS[@]}" "${JFREECHART_JARS[@]}" "$XZ_JAVA_HOME/lib/xz.jar"
         "$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}"
       )
     elif [ -e "$ISABELLE_HOME/Admin/build" ]; then
@@ -299,10 +307,10 @@
       print qq,<MODE NAME="isabelle-root" FILE="isabelle-root.xml" FILE_NAME_GLOB="ROOT"/>\n\n,; }
     print; }' dist/modes/catalog
 
-  cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed
+  cp -p -R -f "${JEDIT_BUILD_JARS[@]}" dist/jars/. || failed
   (
-    for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}" "$XZ_JAVA_HOME/lib/xz.jar" \
-      "$PURE_JAR" "$GRAPHVIEW_JAR" "$SCALA_HOME/lib/scala-compiler.jar"
+    for JAR in "$JEDIT_JAR" "${JEDIT_BUILD_JARS[@]}" "${JFREECHART_JARS[@]}" \
+      "$XZ_JAVA_HOME/lib/xz.jar" "$PURE_JAR" "$GRAPHVIEW_JAR" "$SCALA_HOME/lib/scala-compiler.jar"
     do
       CLASSPATH="$CLASSPATH:$JAR"
     done
@@ -345,9 +353,16 @@
     [ "$RC" = 0 ] || exit "$RC"
   fi
 
+  JEDIT_CLASSPATH="$JEDIT_HOME/dist/jedit.jar"
+  for JAR in "$JEDIT_HOME/dist/jars/Isabelle-jEdit.jar" "${JEDIT_STARTUP_JARS[@]}" \
+    "${JFREECHART_JARS[@]}"
+  do
+    JEDIT_CLASSPATH="$JEDIT_CLASSPATH:$JAR"
+  done
+  JEDIT_CLASSPATH="$(jvmpath "$JEDIT_CLASSPATH")"
+
   export JEDIT_SESSION_DIRS JEDIT_LOGIC JEDIT_PRINT_MODE
 
   exec "$ISABELLE_TOOL" java "${JAVA_ARGS[@]}" \
-    -jar "$(jvmpath "$JEDIT_HOME/dist/jedit.jar")" \
-    "-settings=$(jvmpath "$JEDIT_SETTINGS")" "${ARGS[@]}"
+    -classpath "$JEDIT_CLASSPATH" isabelle.jedit.JEdit_Main "${ARGS[@]}"
 fi
diff -r ef2bb63583ac -r 5bef05f5ed58 src/Tools/jEdit/src/jedit_main.scala
--- a/src/Tools/jEdit/src/jedit_main.scala	Fri Sep 06 15:47:51 2013 +0200
+++ b/src/Tools/jEdit/src/jedit_main.scala	Fri Sep 06 17:01:49 2013 +0200
@@ -20,14 +20,21 @@
     GUI.init_laf()
     Isabelle_System.init()
 
+    val file_args =
+      if (args.isEmpty)
+        Array(Isabelle_System.platform_path(Path.explode("$USER_HOME/Scratch.thy")))
+      else args
+
+    val jedit_options =
+      Isabelle_System.getenv_strict("JEDIT_OPTIONS").split(" +")
+
+    val jedit_settings =
+      Array("-settings=" + Isabelle_System.platform_path(Path.explode("$JEDIT_SETTINGS")))
+
     System.setProperty("jedit.home",
       Isabelle_System.platform_path(Path.explode("$JEDIT_HOME/dist")))
 
-    // FIXME properties from JEDIT_JAVA_OPTIONS JEDIT_SYSTEM_OPTIONS
-    val jedit_options = Isabelle_System.getenv_strict("JEDIT_OPTIONS").split(" +")
-    val jedit_settings =
-      Array("-settings=" + Isabelle_System.platform_path(Path.explode("$JEDIT_SETTINGS")))
-    jEdit.main(jedit_options ++ jedit_settings ++ args)
+    jEdit.main(jedit_options ++ jedit_settings ++ file_args)
   }
 }