2002/07/15 23:14:55

[org.ibex.core.git] / src / org / xwt / Platform.java

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 4fee620..a7f0627 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -36,6 +36,9 @@ public class Platform {
     /** the result of proxy autodetection */
     static HTTP.ProxyInfo cachedProxyInfo = null;
 
+    /** the current build */
+    public static String build = "unknown";
+
     // VM Detection Logic /////////////////////////////////////////////////////////////////////
 
     /** do-nothing method that forces <clinit> to run */
@@ -67,9 +70,19 @@ public class Platform {
                 platform.init();
             }
 
+            try {
+                build = (String)Class.forName("org.xwt.Build").getField("build").get(null);
+            } catch (ClassNotFoundException cnfe) {
+            } catch (Exception e) {
+                if (Log.on) Log.log(Platform.class, "exception while detecting build:");
+                if (Log.on) Log.log(Platform.class, e);
+            }
+            if (Log.on) Log.log(Platform.class, "XWT build: " + build);
+
             if (Log.on) Log.log(Platform.class, "XWT VM detection:   vendor = " + vendor);
             if (Log.on) Log.log(Platform.class, "                   version = " + version);
             if (Log.on) Log.log(Platform.class, "                        os = " + os_name);
+            if (Log.on && Main.applet != null) Log.log(Platform.class, "                   browser = " + Main.applet.getParameter("browser"));
 
             if (platform_class == null) {
                 if (Log.on) Log.log(Platform.class, "Unable to detect JVM");
@@ -78,6 +91,7 @@ public class Platform {
 
             if (Log.on) Log.log(Platform.class, "                  platform = " + platform.getDescriptiveName());
             if (Log.on) Log.log(Platform.class, "                     class = " + platform.getClass().getName());
+            platform.postInit();
 
         } catch (Exception e) {
             if (Log.on) Log.log(Platform.class, "Exception while trying to detect JVM");
@@ -95,6 +109,7 @@ public class Platform {
 
     /** this initializes the platform; code in here can invoke methods on Platform since Platform.platform has already been set */
     protected void init() { }
+    protected void postInit() { }
 
     /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt>; we need to associate DoubleBuffers to surfaces
      *  due to AWT 1.1 requirements (definately for Navigator, possibly also for MSJVM).
@@ -163,7 +178,7 @@ public class Platform {
             System.exit(0);
         } else {
             // just block ourselves forever
-            // FIXME: implement this with an exit variable for MessageQueue and plat.*.eventThread
+            // FIXME
             new Semaphore().block();
         }
     }
@@ -194,6 +209,29 @@ public class Platform {
     /** returns true iff the platform has a case-sensitive filesystem */
     protected boolean _isCaseSensitive() { return true; }
 
+    /** returns the value of the environment variable key, or null if no such key exists */
+    protected String _getEnv(String key) {
+        try {
+            String os = System.getProperty("os.name").toLowerCase();
+            Process p;
+            if (os.indexOf("windows 9") > -1) {
+                p = Runtime.getRuntime().exec("command.com /c set");
+            } else if ( (os.indexOf("nt") > -1) || (os.indexOf("windows 2000") > -1) ) {
+                p = Runtime.getRuntime().exec("cmd.exe /c set");
+            } else {  
+                p = Runtime.getRuntime().exec("env");
+            }
+            BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+            String s;
+            while ((s = br.readLine()) != null)
+                if (s.startsWith(key + "="))
+                    return s.substring(0, key.length() + 1);
+        } catch (Exception e) {
+            if (Log.on) Log.log(this, "Exception while reading from environment:");
+            if (Log.on) Log.log(this, e);
+        }
+        return null;
+    }
 
     // Static methods -- thunk to the instance /////////////////////////////////////////////////////////////////////////
 
@@ -259,6 +297,9 @@ public class Platform {
     /** returns true iff the platform has a case-sensitive filesystem */
     public static boolean isCaseSensitive() { return platform._isCaseSensitive(); }
 
+    /** returns the value of the environment variable key, or null if no such key exists */
+    public static String getEnv(String key) { return platform._getEnv(key); }
+
     /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
     public static String fileDialog(String suggestedFileName, boolean write) {
         if (!ThreadMessage.suspendThread()) return null;
@@ -341,7 +382,7 @@ public class Platform {
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
-        if (Log.on) Log.log(Platform.class, "attempting xwt-proxy DNS proxy detection");
+        if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
         cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;