From ccf0715e9a34f491fa2c52f5f1ba90fd371b7c51 Mon Sep 17 00:00:00 2001 From: tupshin Date: Thu, 5 Feb 2004 01:01:46 +0000 Subject: [PATCH] avoid declararation that methods throws generic Exception darcs-hash:20040205010146-a9258-c185e203455e98c1895035d10ba7dc20a133cc4b.gz --- src/org/ibex/Font.java | 3 ++- src/org/ibex/HTTP.java | 26 +++++++++++++------------- src/org/ibex/Main.java | 4 ++-- src/org/ibex/Scheduler.java | 4 +++- src/org/ibex/Stream.java | 2 +- src/org/ibex/XMLRPC.java | 8 ++++---- src/org/ibex/js/Lexer.java | 2 +- src/org/ibex/js/Parser.java | 2 +- 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/org/ibex/Font.java b/src/org/ibex/Font.java index 2744f0e..cd1ff80 100644 --- a/src/org/ibex/Font.java +++ b/src/org/ibex/Font.java @@ -3,6 +3,7 @@ package org.ibex; import org.xwt.translators.*; import org.ibex.util.*; import java.io.*; +import org.ibex.js.JSExn; // FEATURE: this could be cleaner /** encapsulates a single font (a set of Glyphs) */ @@ -83,7 +84,7 @@ public class Font { if (!encounteredUnrenderedGlyph) return ((((long)width) << 32) | (long)(height & 0xffffffffL)); if (callback != null) Scheduler.add(new Scheduler.Task() { - public void perform() throws Exception { + public void perform() throws IOException, JSExn { // FEATURE this isn't terribly efficient... perhaps the task should go on the last glyph? for(int i=0; i args.length - 1) printUsage(); @@ -78,7 +78,7 @@ public class Main { scarImage = Picture.load((Stream)Main.builtin.get("org/ibex/builtin/scar.png"), - new Scheduler.Task() { public void perform() throws Exception { + new Scheduler.Task() { public void perform() throws JSExn, UnknownHostException { ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1); } }); diff --git a/src/org/ibex/Scheduler.java b/src/org/ibex/Scheduler.java index 43be3d9..ec8253c 100644 --- a/src/org/ibex/Scheduler.java +++ b/src/org/ibex/Scheduler.java @@ -1,6 +1,8 @@ // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] package org.ibex; +import java.io.IOException; + import org.ibex.js.*; import org.ibex.util.*; @@ -10,7 +12,7 @@ public class Scheduler { // Public API Exposed to org.ibex ///////////////////////////////////////////////// private static Scheduler singleton; - public static interface Task { public abstract void perform() throws Exception; } + public static interface Task { public abstract void perform() throws IOException, JSExn; } public static void add(Task t) { Scheduler.runnable.append(t); } public static void init() { if (singleton == null) (singleton = Platform.getScheduler()).run(); } diff --git a/src/org/ibex/Stream.java b/src/org/ibex/Stream.java index d200ce0..526663a 100644 --- a/src/org/ibex/Stream.java +++ b/src/org/ibex/Stream.java @@ -117,7 +117,7 @@ public abstract class Stream extends JS.Cloneable { public int read(byte[] b, int off, int len) throws IOException { int ret = super.read(b, off, len); if (ret != 1) bytesDownloaded += ret; - Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { + Scheduler.add(new Scheduler.Task() { public void perform() throws IOException, JSExn { callback.call(N(bytesDownloaded), N(is instanceof KnownLength ? ((KnownLength)is).getLength() : 0), null, null, 2); } }); diff --git a/src/org/ibex/XMLRPC.java b/src/org/ibex/XMLRPC.java index 6c1699c..5d88d6c 100644 --- a/src/org/ibex/XMLRPC.java +++ b/src/org/ibex/XMLRPC.java @@ -323,20 +323,20 @@ class XMLRPC extends JS { try { new Helper().parse(br); final Object result = fault ? new JSExn(objects.elementAt(0)) : objects.size() == 0 ? null : objects.elementAt(0); - Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(result); }}); + Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(result); }}); } finally { tracker.clear(); objects.setSize(0); } } catch (final JSExn e) { final Exception e2 = e; - Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(e2); }}); + Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(e2); }}); } catch (final IOException e) { final Exception e2 = e; - Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(new JSExn(e2)); }}); + Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(new JSExn(e2)); }}); } catch (final XML.Exn e) { final Exception e2 = e; - Scheduler.add(new Scheduler.Task() { public void perform() throws Exception { callback.unpause(new JSExn(e2)); }}); + Scheduler.add(new Scheduler.Task() { public void perform() throws JSExn { callback.unpause(new JSExn(e2)); }}); } } } diff --git a/src/org/ibex/js/Lexer.java b/src/org/ibex/js/Lexer.java index 6e77eb7..bf350db 100644 --- a/src/org/ibex/js/Lexer.java +++ b/src/org/ibex/js/Lexer.java @@ -24,7 +24,7 @@ import java.io.*; class Lexer implements Tokens { /** for debugging */ - public static void main(String[] s) throws Exception { + public static void main(String[] s) throws IOException { Lexer l = new Lexer(new InputStreamReader(System.in), "stdin", 0); int tok = 0; while((tok = l.getToken()) != -1) System.out.println(codeToString[tok]); diff --git a/src/org/ibex/js/Parser.java b/src/org/ibex/js/Parser.java index 6b37917..a00f3a0 100644 --- a/src/org/ibex/js/Parser.java +++ b/src/org/ibex/js/Parser.java @@ -72,7 +72,7 @@ class Parser extends Lexer implements ByteCodes { public Parser(Reader r, String sourceName, int line) throws IOException { super(r, sourceName, line); } /** for debugging */ - public static void main(String[] s) throws Exception { + public static void main(String[] s) throws IOException { JS block = JS.fromReader("stdin", 0, new InputStreamReader(System.in)); if (block == null) return; System.out.println(block); -- 1.7.10.4