2003/10/31 09:50:08

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

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index c06bb8a..5b1f0ac 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -34,7 +34,7 @@ public class Platform {
     static boolean alreadyDetectedProxy = false;
 
     /** the result of proxy autodetection */
-    static HTTP.Proxy cachedProxyInfo = null;
+    static org.xwt.HTTP.Proxy cachedProxyInfo = null;
 
     /** the current build */
     public static String build = "unknown";
@@ -227,12 +227,8 @@ public class Platform {
     /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
     protected String _fileDialog(String suggestedFileName, boolean write) { return null; }
     public static String fileDialog(String suggestedFileName, boolean write) {
-        if (!ThreadMessage.suspendThread()) return null;
-        try {
-            return platform._fileDialog(suggestedFileName, write);
-        } finally {
-            ThreadMessage.resumeThread();
-        }
+        // FIXME: put self in background
+        return platform._fileDialog(suggestedFileName, write);
     }
 
     /** default implementation is Eric Albert's BrowserLauncher.java */
@@ -285,9 +281,12 @@ public class Platform {
 
         Object icon = b.get("icon", true);
         if (icon != null && icon instanceof Res) {
+            /*
+              FIXME
             Picture pic = Picture.fromRes((Res)icon);
             if (pic != null) ret.setIcon(pic);
             else if (Log.on) Log.log(Platform.class, "unable to load icon " + icon);
+            */
         }
 
         ret.setLimits(b.minwidth, b.minheight, b.maxwidth, b.maxheight);
@@ -301,15 +300,15 @@ public class Platform {
     }
 
     /** detects proxy settings */
-    protected synchronized HTTP.Proxy _detectProxy() { return null; }
-    public static synchronized HTTP.Proxy detectProxy() {
+    protected synchronized org.xwt.HTTP.Proxy _detectProxy() { return null; }
+    public static synchronized org.xwt.HTTP.Proxy detectProxy() {
 
         if (cachedProxyInfo != null) return cachedProxyInfo;
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
         if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
-        cachedProxyInfo = HTTP.Proxy.detectProxyViaManual();
+        cachedProxyInfo = org.xwt.HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");