X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FJava2.java;h=28522d1b42c6ec845321c97590970f06851c7df0;hb=d9fdc968988212807221d0d71d2fb6dc19cb87a3;hp=9b413ff6a592b51aa379ddcef1c9f92cbd73725f;hpb=1d78b2dbeba31c5814824035a8da36a01d928be6;p=org.ibex.core.git diff --git a/src/org/xwt/plat/Java2.java b/src/org/xwt/plat/Java2.java index 9b413ff..28522d1 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.*; @@ -18,7 +18,8 @@ public class Java2 extends AWT { private boolean isJava14 = false; protected boolean _supressDirtyOnResize() { - return (isJava14 && !System.getProperty("os.name", "").equals("Mac OS X"))? false : true; + return false; + //return (isJava14 && !System.getProperty("os.name", "").equals("Mac OS X"))? false : true; } public Java2() { @@ -26,6 +27,7 @@ public class Java2 extends AWT { String versionString = System.getProperty("java.version", ""); int secondDecimal = versionString.substring(versionString.indexOf('.') + 1).indexOf('.'); if (secondDecimal != -1) versionString = versionString.substring(0, secondDecimal); + /* double version = Double.parseDouble(versionString); if (version >= 1.4) { isJava14 = true; @@ -38,6 +40,7 @@ public class Java2 extends AWT { Log.log(this, e); } } + */ javax.swing.FocusManager.setCurrentManager(new javax.swing.FocusManager() { public void processKeyEvent(Component focusedComponent, KeyEvent anEvent) { } public void focusPreviousComponent(Component aComponent) { } @@ -46,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[] { }); @@ -103,7 +106,7 @@ public class Java2 extends AWT { }); } - 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() { @@ -134,23 +137,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, width + insets.left, height + insets.top); - } - _doDrawImage(ourGraphics, ((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); } @@ -194,7 +183,7 @@ 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; @@ -206,7 +195,7 @@ public class Java2 extends AWT { _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; @@ -257,11 +246,6 @@ public class Java2 extends AWT { 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() { @@ -281,20 +265,4 @@ public class Java2 extends AWT { 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); - } - */ - } - }