2003/09/19 08:33:46

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

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index 31062e0..f081948 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 Proxy cachedProxyInfo = null;
+    static HTTP.Proxy cachedProxyInfo = null;
 
     /** the current build */
     public static String build = "unknown";
@@ -119,7 +119,7 @@ public class Platform {
     /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt>; we need to associate PixelBuffers to surfaces
      *  due to AWT 1.1 requirements (definately for Navigator, possibly also for MSJVM).
      */
-    protected PixelBuffer _createDoubleBuffer(int w, int h, Surface owner) { return null; }
+    protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return null; }
     
     /** creates and returns a new surface */
     protected Surface _createSurface(Box b, boolean framed) { return null; }
@@ -201,7 +201,7 @@ public class Platform {
     }
 
     /** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */
-    protected synchronized Proxy _detectProxy() { return null; }
+    protected synchronized HTTP.Proxy _detectProxy() { return null; }
 
     /** 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; }
@@ -316,7 +316,7 @@ public class Platform {
     public static int getScreenHeight() { return platform._getScreenHeight(); }
 
     /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt> */
-    public static PixelBuffer createDoubleBuffer(int w, int h, Surface s) { return platform._createDoubleBuffer(w, h, s); }
+    public static PixelBuffer createPixelBuffer(int w, int h, Surface s) { return platform._createPixelBuffer(w, h, s); }
 
     /** creates and returns a picture */
     public static Picture createPicture(int[] data, int w, int h) { return platform._createPicture(data, w, h); }
@@ -418,14 +418,14 @@ public class Platform {
     }
 
     /** detects proxy settings */
-    public static synchronized Proxy detectProxy() {
+    public static synchronized 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 = Proxy.detectProxyViaManual();
+        cachedProxyInfo = HTTP.Proxy.detectProxyViaManual();
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");