# HG changeset patch
# User wenzelm
# Date 1308833552 -7200
# Node ID cec9b95fa35d5989021b1f80db3159350ef42f95
# Parent  024bd7f5ee0febc770b673c19013330a007fbb10
explicit import java.lang.System to prevent odd scope problems;

diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/General/xml.scala
--- a/src/Pure/General/xml.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/General/xml.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -6,6 +6,7 @@
 
 package isabelle
 
+import java.lang.System
 import java.util.WeakHashMap
 import java.lang.ref.WeakReference
 import javax.xml.parsers.DocumentBuilderFactory
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/PIDE/command.scala
--- a/src/Pure/PIDE/command.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/PIDE/command.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -7,6 +7,7 @@
 
 package isabelle
 
+import java.lang.System
 
 import scala.collection.immutable.SortedMap
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/PIDE/markup_tree.scala
--- a/src/Pure/PIDE/markup_tree.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/PIDE/markup_tree.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -7,7 +7,7 @@
 
 package isabelle
 
-
+import java.lang.System
 import javax.swing.tree.DefaultMutableTreeNode
 
 import scala.collection.immutable.SortedMap
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/cygwin.scala
--- a/src/Pure/System/cygwin.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/cygwin.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -6,6 +6,7 @@
 
 package isabelle
 
+import java.lang.System
 import java.lang.reflect.Method
 import java.io.File
 import java.net.URL
@@ -91,7 +92,7 @@
 
   def check_root(): String =
   {
-    val this_cygwin = java.lang.System.getenv("THIS_CYGWIN")
+    val this_cygwin = System.getenv("THIS_CYGWIN")
     val root =
       if (this_cygwin != null && this_cygwin != "") this_cygwin
       else
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/gui_setup.scala
--- a/src/Pure/System/gui_setup.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/gui_setup.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -6,6 +6,8 @@
 
 package isabelle
 
+import java.lang.System
+
 import scala.swing.{Button, FlowPanel, BorderPanel, MainFrame, TextArea, SwingApplication}
 import scala.swing.event.ButtonClicked
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/isabelle_process.scala
--- a/src/Pure/System/isabelle_process.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/isabelle_process.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -7,6 +7,7 @@
 
 package isabelle
 
+import java.lang.System
 import java.util.concurrent.LinkedBlockingQueue
 import java.io.{BufferedReader, BufferedWriter, InputStreamReader, OutputStreamWriter,
   InputStream, OutputStream, BufferedOutputStream, IOException}
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/isabelle_system.scala
--- a/src/Pure/System/isabelle_system.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/isabelle_system.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -6,6 +6,7 @@
 
 package isabelle
 
+import java.lang.System
 import java.util.regex.Pattern
 import java.util.Locale
 import java.io.{InputStream, FileInputStream, OutputStream, FileOutputStream, File,
@@ -41,7 +42,7 @@
   {
     import scala.collection.JavaConversions._
 
-    val env0 = Map(java.lang.System.getenv.toList: _*) +
+    val env0 = Map(System.getenv.toList: _*) +
       ("THIS_JAVA" -> this_java())
 
     val isabelle_home =
@@ -49,7 +50,7 @@
       else
         env0.get("ISABELLE_HOME") match {
           case None | Some("") =>
-            val path = java.lang.System.getProperty("isabelle.home")
+            val path = System.getProperty("isabelle.home")
             if (path == null || path == "") error("Unknown Isabelle home directory")
             else path
           case Some(path) => path
@@ -70,8 +71,8 @@
             else (entry.substring(0, i) -> entry.substring(i + 1))
           }
         Map(entries: _*) +
-          ("HOME" -> java.lang.System.getenv("HOME")) +
-          ("PATH" -> java.lang.System.getenv("PATH"))
+          ("HOME" -> System.getenv("HOME")) +
+          ("PATH" -> System.getenv("PATH"))
       }
   }
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/platform.scala
--- a/src/Pure/System/platform.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/platform.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -6,6 +6,7 @@
 
 package isabelle
 
+import java.lang.System
 import javax.swing.UIManager
 
 import scala.util.matching.Regex
@@ -34,7 +35,7 @@
   lazy val jvm_platform: String =
   {
     val arch =
-      java.lang.System.getProperty("os.arch") match {
+      System.getProperty("os.arch") match {
         case X86() => "x86"
         case X86_64() => "x86_64"
         case Sparc() => "sparc"
@@ -42,7 +43,7 @@
         case _ => error("Failed to determine CPU architecture")
       }
     val os =
-      java.lang.System.getProperty("os.name") match {
+      System.getProperty("os.name") match {
         case Solaris() => "solaris"
         case Linux() => "linux"
         case Darwin() => "darwin"
@@ -55,7 +56,7 @@
 
   /* JVM name */
 
-  val jvm_name: String = java.lang.System.getProperty("java.vm.name")
+  val jvm_name: String = System.getProperty("java.vm.name")
   val is_hotspot: Boolean = jvm_name.startsWith("Java HotSpot")
 
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/session.scala
--- a/src/Pure/System/session.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/session.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -7,6 +7,7 @@
 
 package isabelle
 
+import java.lang.System
 
 import scala.actors.TIMEOUT
 import scala.actors.Actor
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Pure/System/standard_system.scala
--- a/src/Pure/System/standard_system.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Pure/System/standard_system.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -6,6 +6,7 @@
 
 package isabelle
 
+import java.lang.System
 import java.util.zip.{ZipEntry, ZipInputStream}
 import java.util.regex.Pattern
 import java.util.Locale
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/document_view.scala
--- a/src/Tools/jEdit/src/document_view.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/document_view.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -12,6 +12,7 @@
 
 import scala.actors.Actor._
 
+import java.lang.System
 import java.awt.{BorderLayout, Graphics, Color, Dimension, Graphics2D, Point}
 import java.awt.event.{MouseAdapter, MouseMotionAdapter, MouseEvent,
   FocusAdapter, FocusEvent, WindowEvent, WindowAdapter}
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/html_panel.scala
--- a/src/Tools/jEdit/src/html_panel.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/html_panel.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -9,6 +9,7 @@
 
 import isabelle._
 
+import java.lang.System
 import java.io.StringReader
 import java.awt.{Font, BorderLayout, Dimension, GraphicsEnvironment, Toolkit, FontMetrics}
 import java.awt.event.MouseEvent
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/output_dockable.scala
--- a/src/Tools/jEdit/src/output_dockable.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/output_dockable.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -14,6 +14,7 @@
 import scala.swing.{FlowPanel, Button, CheckBox}
 import scala.swing.event.ButtonClicked
 
+import java.lang.System
 import java.awt.BorderLayout
 import java.awt.event.{ComponentEvent, ComponentAdapter}
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/plugin.scala
--- a/src/Tools/jEdit/src/plugin.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/plugin.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -9,6 +9,7 @@
 
 import isabelle._
 
+import java.lang.System
 import java.io.{FileInputStream, IOException}
 import java.awt.Font
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/protocol_dockable.scala
--- a/src/Tools/jEdit/src/protocol_dockable.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/protocol_dockable.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -9,6 +9,8 @@
 
 import isabelle._
 
+import java.lang.System
+
 import scala.actors.Actor._
 import scala.swing.{TextArea, ScrollPane}
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/raw_output_dockable.scala
--- a/src/Tools/jEdit/src/raw_output_dockable.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/raw_output_dockable.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -9,6 +9,8 @@
 
 import isabelle._
 
+import java.lang.System
+
 import scala.actors.Actor._
 import scala.swing.{TextArea, ScrollPane}
 
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/scala_console.scala
--- a/src/Tools/jEdit/src/scala_console.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/scala_console.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -14,6 +14,7 @@
 import org.gjt.sp.jedit.{jEdit, JARClassLoader}
 import org.gjt.sp.jedit.MiscUtilities
 
+import java.lang.System
 import java.io.{File, OutputStream, Writer, PrintWriter}
 
 import scala.tools.nsc.{Interpreter, GenericRunnerSettings, NewLinePrintWriter, ConsoleWriter}
diff -r 024bd7f5ee0f -r cec9b95fa35d src/Tools/jEdit/src/session_dockable.scala
--- a/src/Tools/jEdit/src/session_dockable.scala	Thu Jun 23 14:48:32 2011 +0200
+++ b/src/Tools/jEdit/src/session_dockable.scala	Thu Jun 23 14:52:32 2011 +0200
@@ -13,6 +13,7 @@
 import scala.swing.{FlowPanel, Button, TextArea, Label, ScrollPane, TabbedPane, Component, Swing}
 import scala.swing.event.{ButtonClicked, SelectionChanged}
 
+import java.lang.System
 import java.awt.BorderLayout
 import javax.swing.border.{BevelBorder, SoftBevelBorder}