X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=049404e022465653d4980aa3c636e5e914514ff7;hb=8ea2f2734a60f0c4fa9c82083469165283a8b810;hp=e5768f025069040c17c2b54796bf9b94e4e28fbe;hpb=1e651bf5d79cc35fa6212766ed4a958cb265fad0;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index e5768f0..049404e 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -1,4 +1,4 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.lang.reflect.*;
@@ -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";
@@ -116,10 +116,10 @@ public class Platform {
     protected void init() { }
     protected void postInit() { }
 
-    /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt>; we need to associate DoubleBuffers to surfaces
+    /** 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 DoubleBuffer _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; }
@@ -170,13 +170,6 @@ public class Platform {
     /** returns the maximum number of threads that the XWT engine can create without adversely affecting the host OS */
     protected int _maxThreads() { return 25; }
 
-    /** creates a weak reference */
-    protected org.xwt.Weak _getWeak(final Object o) {
-        return new org.xwt.Weak() {
-                public Object get() { return o; }
-            };
-    }
-
         /** Called once XWT is initialized and the application is running. */
         protected void _running() {}
     
@@ -201,7 +194,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; }
@@ -211,12 +204,7 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-        return this.getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
-    }
-
-    /** returns an InputStream to the builtin xwar */
-    protected InputStream _getFreetypeInputStream() {
-        return this.getClass().getClassLoader().getResourceAsStream("org/xwt/freetype.mips");
+        return this.getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.jar");
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */
@@ -280,9 +268,6 @@ public class Platform {
     /** returns a list of all platform-specific fonts available */
     public static String[] listFonts() { return platform._listFonts(); }
 
-    /** creates a weak reference */
-    public static org.xwt.Weak getWeak(Object o) { return platform._getWeak(o); }
-
     /** opens a connection to the resource identified by URL u, and returns an InputStream */
     public static InputStream urlToInputStream(URL u) throws IOException { return platform._urlToInputStream(u); }
 
@@ -304,7 +289,7 @@ public class Platform {
     public static int getScreenHeight() { return platform._getScreenHeight(); }
 
     /** creates and returns a doublebuffer 'belonging' to <tt>owner</tt> */
-    public static DoubleBuffer 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); }
@@ -312,9 +297,6 @@ public class Platform {
     /** returns an InputStream to the builtin xwar */
     public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
         
-    /** returns an InputStream to the freetype mips binary */
-    public static InputStream getFreetypeInputStream() { return platform._getFreetypeInputStream(); }
-        
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -380,9 +362,9 @@ public class Platform {
     /** this method invokes the platform _createSurface() method and then enforces a few post-call invariants */
     public static Surface createSurface(Box b, boolean framed, boolean refreshable) {
         Surface ret = platform._createSurface(b, framed);
-        ret.setInvisible(b.invisible);
         b.width = b.height < Surface.scarPicture.getWidth() ? Surface.scarPicture.getWidth() : b.width;
         b.height = b.height < Surface.scarPicture.getHeight() ? Surface.scarPicture.getHeight() : b.height;
+        ret.setInvisible(false);
 
         Object titlebar = b.get("titlebar", true);
         if (titlebar != null) ret.setTitleBarText(titlebar.toString());
@@ -406,14 +388,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");