X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FJava2.java;h=e596c624b8da9dcfe85f62ba85df1e60788607a9;hb=0d1fcf8e921755ad62d78ae4e51c0ed70a6bb8f7;hp=f855961aec0361b790314fab1227062bd17d8d4c;hpb=b286029b4b444ae3f7dbe917dcc63a50a7d7a65b;p=org.ibex.core.git diff --git a/src/org/xwt/plat/Java2.java b/src/org/xwt/plat/Java2.java index f855961..e596c62 100644 --- a/src/org/xwt/plat/Java2.java +++ b/src/org/xwt/plat/Java2.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.plat; import java.awt.*; @@ -49,11 +49,11 @@ public class Java2 extends AWT { } /** this is done with reflection in case a new version of the plugin comes out that doesn't let us pull the sun.plugin.* trick */ - protected synchronized org.xwt.Proxy _detectProxy() { - return (org.xwt.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { + protected synchronized org.xwt.HTTP.Proxy _detectProxy() { + return (org.xwt.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { public Object run() { try { - org.xwt.Proxy pi = new org.xwt.Proxy(); + org.xwt.HTTP.Proxy pi = new org.xwt.HTTP.Proxy(); Class PluginProxyHandler = Class.forName("sun.plugin.protocol.PluginProxyHandler"); Method getDefaultProxyHandler = PluginProxyHandler.getMethod("getDefaultProxyHandler", new Class[] { }); @@ -89,24 +89,7 @@ public class Java2 extends AWT { }}); } - protected Socket __getSocket(String host, int port, boolean ssl, boolean negotiate) throws IOException { - return super._getSocket(host, port, ssl, negotiate); - } - protected Socket _getSocket(final String host, final int port, final boolean ssl, final boolean negotiate) throws IOException { - return (Socket)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { - public Object run() { - try { - return __getSocket(host, port, ssl, negotiate); - } catch (Exception e) { - if (Log.on) Log.log(Java2.class, "Error attempting to create socket"); - if (Log.on) Log.log(Java2.class, e); - return null; - } - } - }); - } - - protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) { return new Java2DoubleBuffer(w, h); } + protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return new Java2PixelBuffer(w, h); } protected Surface _createSurface(final Box root, final boolean framed) { return (Surface)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { public Object run() { @@ -137,23 +120,9 @@ public class Java2 extends AWT { public Java2Surface(Box root, boolean framed) { super(root, framed); } - public void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2) { - if (ourGraphics == null) { - ourGraphics = window.getGraphics(); - - // sometimes jdk1.4 doesn't set the clip properly when we're in the middle of a resize - ourGraphics.setClip(insets.left, insets.top, root.width + insets.left, root.height + insets.top); - } - _doDrawImage(window.getGraphics(), ((AWTDoubleBuffer)s).i, dx + insets.left, dy + insets.top, dx2 + insets.left, dy2 + insets.top, - sx, sy, sx + (dx2 - dx), sy + (dy2 - dy), null); - } - protected void _setMinimized(boolean b) { - if (frame == null) { - if (Log.on) Log.log(this, "JDK 1.2 can only minimize frames, not windows"); - return; - } - if (b) frame.setState(java.awt.Frame.ICONIFIED); + if (frame == null) Log.log(this, "JDK 1.2 can only minimize frames, not windows"); + else if (b) frame.setState(java.awt.Frame.ICONIFIED); else frame.setState(java.awt.Frame.NORMAL); } @@ -197,19 +166,15 @@ public class Java2 extends AWT { } } - protected static class Java2DoubleBuffer extends AWTDoubleBuffer { + protected static class Java2PixelBuffer extends AWTPixelBuffer { private static ColorModel cm = Toolkit.getDefaultToolkit().getColorModel(); private static Hashtable emptyHashtable = new Hashtable(); private static short[] sbank = null; private static int[] ibank = null; private static byte[] bbank = null; private static int bank_start = 0; - - public void drawPicture(Picture source, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2) { - _doDrawImage(g, ((AWTPicture)source).i, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, null); - } - - public Java2DoubleBuffer(int w, int h) { + + public Java2PixelBuffer(int w, int h) { SampleModel sm = cm.createCompatibleSampleModel(w, h); int numSamples = w * h * sm.getNumDataElements(); DataBuffer buf = null; @@ -252,52 +217,6 @@ public class Java2 extends AWT { } } - /** used to avoid garbage creation with getClipBounds() */ - private static Rectangle clipBounds = new Rectangle(); - - protected static void _doDrawImage(Graphics g, Image i, int dx1, int dy1, int dx2, int dy2, int sx1, int sy1, int sx2, int sy2, ImageObserver o) { - if (dx1 == dx2 || dy1 == dy2) return; - g.drawImage(i, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, o); - } - - protected org.xwt.Weak _getWeak(Object o) { return new Java2Weak(o); } - private static class Java2Weak extends java.lang.ref.WeakReference implements org.xwt.Weak { - public Java2Weak(Object o) { super(o); } - } - - private String __getClipBoard() { return super._getClipBoard(); } - protected String _getClipBoard() { - return (String)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { - public Object run() { return __getClipBoard(); } - }); - } - - private void __setClipBoard(String s) { super._setClipBoard(s); } - protected void _setClipBoard(final String s) { - java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() { - public Object run() { - __setClipBoard(s); - return null; - } - }); - } - protected String getDescriptiveName() { return isJava14 ? "Java 1.4+ JVM" : "Java 1.2+ JVM"; } - protected void _newBrowserWindow(String url) { - /* - FIXME - if (Main.applet == null) { - if (Log.on) Log.log(this, "Main.applet is null; cannot invoke showDocument()"); - return; - } - if (Log.on) Log.log(this, "asking browser to show URL " + url); - try { - Main.applet.getAppletContext().showDocument(new URL(url), "_blank"); - } catch (MalformedURLException e) { - if (Log.on) Log.log(this, e); - } - */ - } - }