1.1 --- a/src/Pure/General/xml.scala Thu Jun 23 14:48:32 2011 +0200
1.2 +++ b/src/Pure/General/xml.scala Thu Jun 23 14:52:32 2011 +0200
1.3 @@ -6,6 +6,7 @@
1.4
1.5 package isabelle
1.6
1.7 +import java.lang.System
1.8 import java.util.WeakHashMap
1.9 import java.lang.ref.WeakReference
1.10 import javax.xml.parsers.DocumentBuilderFactory
2.1 --- a/src/Pure/PIDE/command.scala Thu Jun 23 14:48:32 2011 +0200
2.2 +++ b/src/Pure/PIDE/command.scala Thu Jun 23 14:52:32 2011 +0200
2.3 @@ -7,6 +7,7 @@
2.4
2.5 package isabelle
2.6
2.7 +import java.lang.System
2.8
2.9 import scala.collection.immutable.SortedMap
2.10
3.1 --- a/src/Pure/PIDE/markup_tree.scala Thu Jun 23 14:48:32 2011 +0200
3.2 +++ b/src/Pure/PIDE/markup_tree.scala Thu Jun 23 14:52:32 2011 +0200
3.3 @@ -7,7 +7,7 @@
3.4
3.5 package isabelle
3.6
3.7 -
3.8 +import java.lang.System
3.9 import javax.swing.tree.DefaultMutableTreeNode
3.10
3.11 import scala.collection.immutable.SortedMap
4.1 --- a/src/Pure/System/cygwin.scala Thu Jun 23 14:48:32 2011 +0200
4.2 +++ b/src/Pure/System/cygwin.scala Thu Jun 23 14:52:32 2011 +0200
4.3 @@ -6,6 +6,7 @@
4.4
4.5 package isabelle
4.6
4.7 +import java.lang.System
4.8 import java.lang.reflect.Method
4.9 import java.io.File
4.10 import java.net.URL
4.11 @@ -91,7 +92,7 @@
4.12
4.13 def check_root(): String =
4.14 {
4.15 - val this_cygwin = java.lang.System.getenv("THIS_CYGWIN")
4.16 + val this_cygwin = System.getenv("THIS_CYGWIN")
4.17 val root =
4.18 if (this_cygwin != null && this_cygwin != "") this_cygwin
4.19 else
5.1 --- a/src/Pure/System/gui_setup.scala Thu Jun 23 14:48:32 2011 +0200
5.2 +++ b/src/Pure/System/gui_setup.scala Thu Jun 23 14:52:32 2011 +0200
5.3 @@ -6,6 +6,8 @@
5.4
5.5 package isabelle
5.6
5.7 +import java.lang.System
5.8 +
5.9 import scala.swing.{Button, FlowPanel, BorderPanel, MainFrame, TextArea, SwingApplication}
5.10 import scala.swing.event.ButtonClicked
5.11
6.1 --- a/src/Pure/System/isabelle_process.scala Thu Jun 23 14:48:32 2011 +0200
6.2 +++ b/src/Pure/System/isabelle_process.scala Thu Jun 23 14:52:32 2011 +0200
6.3 @@ -7,6 +7,7 @@
6.4
6.5 package isabelle
6.6
6.7 +import java.lang.System
6.8 import java.util.concurrent.LinkedBlockingQueue
6.9 import java.io.{BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter,
6.10 InputStream, OutputStream, BufferedOutputStream, IOException}
7.1 --- a/src/Pure/System/isabelle_system.scala Thu Jun 23 14:48:32 2011 +0200
7.2 +++ b/src/Pure/System/isabelle_system.scala Thu Jun 23 14:52:32 2011 +0200
7.3 @@ -6,6 +6,7 @@
7.4
7.5 package isabelle
7.6
7.7 +import java.lang.System
7.8 import java.util.regex.Pattern
7.9 import java.util.Locale
7.10 import java.io.{InputStream, FileInputStream, OutputStream, FileOutputStream, File,
7.11 @@ -41,7 +42,7 @@
7.12 {
7.13 import scala.collection.JavaConversions._
7.14
7.15 - val env0 = Map(java.lang.System.getenv.toList: _*) +
7.16 + val env0 = Map(System.getenv.toList: _*) +
7.17 ("THIS_JAVA" -> this_java())
7.18
7.19 val isabelle_home =
7.20 @@ -49,7 +50,7 @@
7.21 else
7.22 env0.get("ISABELLE_HOME") match {
7.23 case None | Some("") =>
7.24 - val path = java.lang.System.getProperty("isabelle.home")
7.25 + val path = System.getProperty("isabelle.home")
7.26 if (path == null || path == "") error("Unknown Isabelle home directory")
7.27 else path
7.28 case Some(path) => path
7.29 @@ -70,8 +71,8 @@
7.30 else (entry.substring(0, i) -> entry.substring(i + 1))
7.31 }
7.32 Map(entries: _*) +
7.33 - ("HOME" -> java.lang.System.getenv("HOME")) +
7.34 - ("PATH" -> java.lang.System.getenv("PATH"))
7.35 + ("HOME" -> System.getenv("HOME")) +
7.36 + ("PATH" -> System.getenv("PATH"))
7.37 }
7.38 }
7.39
8.1 --- a/src/Pure/System/platform.scala Thu Jun 23 14:48:32 2011 +0200
8.2 +++ b/src/Pure/System/platform.scala Thu Jun 23 14:52:32 2011 +0200
8.3 @@ -6,6 +6,7 @@
8.4
8.5 package isabelle
8.6
8.7 +import java.lang.System
8.8 import javax.swing.UIManager
8.9
8.10 import scala.util.matching.Regex
8.11 @@ -34,7 +35,7 @@
8.12 lazy val jvm_platform: String =
8.13 {
8.14 val arch =
8.15 - java.lang.System.getProperty("os.arch") match {
8.16 + System.getProperty("os.arch") match {
8.17 case X86() => "x86"
8.18 case X86_64() => "x86_64"
8.19 case Sparc() => "sparc"
8.20 @@ -42,7 +43,7 @@
8.21 case _ => error("Failed to determine CPU architecture")
8.22 }
8.23 val os =
8.24 - java.lang.System.getProperty("os.name") match {
8.25 + System.getProperty("os.name") match {
8.26 case Solaris() => "solaris"
8.27 case Linux() => "linux"
8.28 case Darwin() => "darwin"
8.29 @@ -55,7 +56,7 @@
8.30
8.31 /* JVM name */
8.32
8.33 - val jvm_name: String = java.lang.System.getProperty("java.vm.name")
8.34 + val jvm_name: String = System.getProperty("java.vm.name")
8.35 val is_hotspot: Boolean = jvm_name.startsWith("Java HotSpot")
8.36
8.37
9.1 --- a/src/Pure/System/session.scala Thu Jun 23 14:48:32 2011 +0200
9.2 +++ b/src/Pure/System/session.scala Thu Jun 23 14:52:32 2011 +0200
9.3 @@ -7,6 +7,7 @@
9.4
9.5 package isabelle
9.6
9.7 +import java.lang.System
9.8
9.9 import scala.actors.TIMEOUT
9.10 import scala.actors.Actor
10.1 --- a/src/Pure/System/standard_system.scala Thu Jun 23 14:48:32 2011 +0200
10.2 +++ b/src/Pure/System/standard_system.scala Thu Jun 23 14:52:32 2011 +0200
10.3 @@ -6,6 +6,7 @@
10.4
10.5 package isabelle
10.6
10.7 +import java.lang.System
10.8 import java.util.zip.{ZipEntry, ZipInputStream}
10.9 import java.util.regex.Pattern
10.10 import java.util.Locale
11.1 --- a/src/Tools/jEdit/src/document_view.scala Thu Jun 23 14:48:32 2011 +0200
11.2 +++ b/src/Tools/jEdit/src/document_view.scala Thu Jun 23 14:52:32 2011 +0200
11.3 @@ -12,6 +12,7 @@
11.4
11.5 import scala.actors.Actor._
11.6
11.7 +import java.lang.System
11.8 import java.awt.{BorderLayout, Graphics, Color, Dimension, Graphics2D, Point}
11.9 import java.awt.event.{MouseAdapter, MouseMotionAdapter, MouseEvent,
11.10 FocusAdapter, FocusEvent, WindowEvent, WindowAdapter}
12.1 --- a/src/Tools/jEdit/src/html_panel.scala Thu Jun 23 14:48:32 2011 +0200
12.2 +++ b/src/Tools/jEdit/src/html_panel.scala Thu Jun 23 14:52:32 2011 +0200
12.3 @@ -9,6 +9,7 @@
12.4
12.5 import isabelle._
12.6
12.7 +import java.lang.System
12.8 import java.io.StringReader
12.9 import java.awt.{Font, BorderLayout, Dimension, GraphicsEnvironment, Toolkit, FontMetrics}
12.10 import java.awt.event.MouseEvent
13.1 --- a/src/Tools/jEdit/src/output_dockable.scala Thu Jun 23 14:48:32 2011 +0200
13.2 +++ b/src/Tools/jEdit/src/output_dockable.scala Thu Jun 23 14:52:32 2011 +0200
13.3 @@ -14,6 +14,7 @@
13.4 import scala.swing.{FlowPanel, Button, CheckBox}
13.5 import scala.swing.event.ButtonClicked
13.6
13.7 +import java.lang.System
13.8 import java.awt.BorderLayout
13.9 import java.awt.event.{ComponentEvent, ComponentAdapter}
13.10
14.1 --- a/src/Tools/jEdit/src/plugin.scala Thu Jun 23 14:48:32 2011 +0200
14.2 +++ b/src/Tools/jEdit/src/plugin.scala Thu Jun 23 14:52:32 2011 +0200
14.3 @@ -9,6 +9,7 @@
14.4
14.5 import isabelle._
14.6
14.7 +import java.lang.System
14.8 import java.io.{FileInputStream, IOException}
14.9 import java.awt.Font
14.10
15.1 --- a/src/Tools/jEdit/src/protocol_dockable.scala Thu Jun 23 14:48:32 2011 +0200
15.2 +++ b/src/Tools/jEdit/src/protocol_dockable.scala Thu Jun 23 14:52:32 2011 +0200
15.3 @@ -9,6 +9,8 @@
15.4
15.5 import isabelle._
15.6
15.7 +import java.lang.System
15.8 +
15.9 import scala.actors.Actor._
15.10 import scala.swing.{TextArea, ScrollPane}
15.11
16.1 --- a/src/Tools/jEdit/src/raw_output_dockable.scala Thu Jun 23 14:48:32 2011 +0200
16.2 +++ b/src/Tools/jEdit/src/raw_output_dockable.scala Thu Jun 23 14:52:32 2011 +0200
16.3 @@ -9,6 +9,8 @@
16.4
16.5 import isabelle._
16.6
16.7 +import java.lang.System
16.8 +
16.9 import scala.actors.Actor._
16.10 import scala.swing.{TextArea, ScrollPane}
16.11
17.1 --- a/src/Tools/jEdit/src/scala_console.scala Thu Jun 23 14:48:32 2011 +0200
17.2 +++ b/src/Tools/jEdit/src/scala_console.scala Thu Jun 23 14:52:32 2011 +0200
17.3 @@ -14,6 +14,7 @@
17.4 import org.gjt.sp.jedit.{jEdit, JARClassLoader}
17.5 import org.gjt.sp.jedit.MiscUtilities
17.6
17.7 +import java.lang.System
17.8 import java.io.{File, OutputStream, Writer, PrintWriter}
17.9
17.10 import scala.tools.nsc.{Interpreter, GenericRunnerSettings, NewLinePrintWriter, ConsoleWriter}
18.1 --- a/src/Tools/jEdit/src/session_dockable.scala Thu Jun 23 14:48:32 2011 +0200
18.2 +++ b/src/Tools/jEdit/src/session_dockable.scala Thu Jun 23 14:52:32 2011 +0200
18.3 @@ -13,6 +13,7 @@
18.4 import scala.swing.{FlowPanel, Button, TextArea, Label, ScrollPane, TabbedPane, Component, Swing}
18.5 import scala.swing.event.{ButtonClicked, SelectionChanged}
18.6
18.7 +import java.lang.System
18.8 import java.awt.BorderLayout
18.9 import javax.swing.border.{BevelBorder, SoftBevelBorder}
18.10