From c55a2217bcedf009ad6db9cbaddbcc28b6bda06d Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 06:50:44 +0000 Subject: [PATCH] 2002/10/04 02:09:25 darcs-hash:20040130065044-2ba56-07cedff7ca2914b422e5d8735e0f93e60eb79291.gz --- src/org/xwt/Main.java | 10 +++++----- src/org/xwt/PNG.java | 2 +- src/org/xwt/Platform.java | 6 +++--- src/org/xwt/Proxy.java | 14 +++++++------- src/org/xwt/XWF.java | 6 +++--- src/org/xwt/plat/AWT.java | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java index 294fd9e..eaa4ab8 100644 --- a/src/org/xwt/Main.java +++ b/src/org/xwt/Main.java @@ -118,11 +118,11 @@ public class Main extends Applet { ThreadMessage.newthread(new JSObject.JSFunction() { public Object call(Context cx, Scriptable thisObj, Scriptable ctorObj, Object[] arg) throws JavaScriptException { new Box(initialTemplate_f, null); - doneInitializing = true; - if (Surface.allSurfaces.size() == 0) { - Log.log(this, "exiting because all surfaces are gone"); - Platform.exit(); - } + doneInitializing = true; + if (Surface.allSurfaces.size() == 0) { + Log.log(this, "exiting because all surfaces are gone"); + Platform.exit(); + } return null; } }); diff --git a/src/org/xwt/PNG.java b/src/org/xwt/PNG.java index 03b05f9..801a3f2 100644 --- a/src/org/xwt/PNG.java +++ b/src/org/xwt/PNG.java @@ -164,7 +164,7 @@ public class PNG implements ImageDecoder { inputStream.skip(chunkLength); return; } - int len = palette.length; + int len = palette.length; if (colorType == 3) { transparency = true; diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java index 0963cd5..cbae095 100644 --- a/src/org/xwt/Platform.java +++ b/src/org/xwt/Platform.java @@ -66,9 +66,9 @@ public class Platform { else if (version.startsWith("1.4")) platform_class = "Java14"; else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12"; - // Disable 2d hardware acceleration on Jaguar - if (os_name.equals("Mac OS X") && os_version.equals("10.2")) - System.setProperty("com.apple.hwaccel", "false"); + // Disable 2d hardware acceleration on Jaguar + if (os_name.equals("Mac OS X") && os_version.equals("10.2")) + System.setProperty("com.apple.hwaccel", "false"); if (platform_class != null) { platform = (Platform)Class.forName("org.xwt.plat." + platform_class).newInstance(); diff --git a/src/org/xwt/Proxy.java b/src/org/xwt/Proxy.java index 83950aa..632034e 100644 --- a/src/org/xwt/Proxy.java +++ b/src/org/xwt/Proxy.java @@ -126,13 +126,13 @@ public class Proxy { if (e instanceof EcmaError) Log.log(HTTP.class, ((EcmaError)e).getMessage() + " at " + ((EcmaError)e).getSourceName() + ":" + ((EcmaError)e).getLineNumber()); else if (e instanceof JavaScriptException) { - try { - XWT.recursivePrintObject.call(Context.enter(), null, null, new Object[] { - ((JavaScriptException)e).getValue() }); - } catch (Exception e2) { - Log.log(Platform.class, e); - } - } + try { + XWT.recursivePrintObject.call(Context.enter(), null, null, new Object[] { + ((JavaScriptException)e).getValue() }); + } catch (Exception e2) { + Log.log(Platform.class, e); + } + } else Log.log(Platform.class, e); } return null; diff --git a/src/org/xwt/XWF.java b/src/org/xwt/XWF.java index c3d43a2..da6f57b 100644 --- a/src/org/xwt/XWF.java +++ b/src/org/xwt/XWF.java @@ -79,9 +79,9 @@ public class XWF { for(int i=0; i?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~".indexOf(text.charAt(i)); if (c == -1 || metrics[c] == null) { - left += metrics[64] != null ? metrics[64][4] : 10; - continue; - } + left += metrics[64] != null ? metrics[64][4] : 10; + continue; + } buf.drawPicture(pg, left, y - (metrics[c][5] - metrics[c][2]), diff --git a/src/org/xwt/plat/AWT.java b/src/org/xwt/plat/AWT.java index ad67bc0..46bb5f6 100644 --- a/src/org/xwt/plat/AWT.java +++ b/src/org/xwt/plat/AWT.java @@ -327,7 +327,7 @@ public class AWT extends Platform { public void windowDeiconified(WindowEvent e) { dirty(0, 0, width, height); Minimized(false); } public void windowActivated(WindowEvent e) { Focused(true); } public void windowDeactivated(WindowEvent e) { Focused(false); } - public void componentMoved(ComponentEvent e) { PosChange(window.getLocation().x + insets.left, window.getLocation().y + insets.top); } + public void componentMoved(ComponentEvent e) { PosChange(window.getLocation().x + insets.left, window.getLocation().y + insets.top); } public void componentResized(ComponentEvent e) { // we have to periodically do this; I don't know why -- 1.7.10.4