2003/07/07 04:40:50

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

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index e2c148c..6ee700e 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -86,7 +86,6 @@ public class Platform {
             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 + " [version " + os_version + "]");
-            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");
@@ -176,19 +175,11 @@ public class Platform {
             };
     }
 
-       /** Called once XWT is initialized and the application is running. */
-       protected void _running() {}
+        /** Called once XWT is initialized and the application is running. */
+        protected void _running() {}
     
     /** quits XWT */
-    protected void _exit() {
-        if (Main.applet == null) {
-            System.exit(0);
-        } else {
-            // just block ourselves forever
-            // FIXME
-            new Semaphore().block();
-        }
-    }
+    protected void _exit() { System.exit(0); }
 
     /** used to notify the user of very serious failures; usually used when logging is not working or unavailable */
     protected void _criticalAbort(String message) { _exit(); }
@@ -218,7 +209,7 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-       return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+        return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */
@@ -313,7 +304,7 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
-       
+        
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -354,12 +345,12 @@ public class Platform {
         platform._newBrowserWindow(url);
     }
 
-       /** Called once XWT is initialized and the application is running. */
-       public static void running() {
-               Log.log(Platform.class, "XWT is running");
-               platform._running();
-       }
-       
+        /** Called once XWT is initialized and the application is running. */
+        public static void running() {
+                Log.log(Platform.class, "XWT is running");
+                platform._running();
+        }
+        
     /** quits XWT */
     public static void exit() {
         Log.log(Platform.class, "exiting via Platform.exit()");
@@ -383,10 +374,10 @@ public class Platform {
         b.set(Box.size, 0, b.size(0) < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.size(0));
         b.set(Box.size, 1, b.size(1) < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.size(1));
 
-        Object titlebar = b.get("titlebar", null, true);
+        Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
 
-        Object icon = b.get("icon", null, true);
+        Object icon = b.get("icon", true);
         if (icon != null && !"".equals(icon)) {
             Picture pic = Box.getPicture(icon.toString());
             if (pic != null) ret.setIcon(pic);
@@ -423,7 +414,7 @@ public class Platform {
     }
 
     public static synchronized ImageDecoder decodeJPEG(InputStream is, String name) {
-       return platform._decodeJPEG(is, name);
+        return platform._decodeJPEG(is, name);
     }
 
     // Helpful font parsing stuff //////////////////////////////////////////////////////