Add IO.exception(string)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d666d741 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d666d741 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d666d741 Branch: refs/heads/add-contract-tests Commit: d666d74196d66a9f111f33fb9dafce7d9ade52cd Parents: 1ecb27c Author: Andy Seaborne <[email protected]> Authored: Thu May 14 14:45:14 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Thu May 14 14:45:14 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/jena/atlas/io/IO.java | 13 +++++++++---- .../java/org/apache/jena/atlas/io/IndentedWriter.java | 5 ++--- .../java/org/apache/jena/atlas/io/PeekInputStream.java | 3 +-- .../main/java/org/apache/jena/atlas/io/PeekReader.java | 3 +-- 4 files changed, 13 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/d666d741/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java index ac312e8..c20b920 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IO.java @@ -40,10 +40,8 @@ public class IO * If the filename ends in .gz, wrap in GZIPInputStream */ static public InputStream openFile(String filename) { - try { - return openFileEx(filename) ; - } - catch (Exception ex) { throw new RuntimeIOException(ex) ; } + try { return openFileEx(filename) ; } + catch (IOException ex) { IO.exception(ex); return null ; } } /** Open an input stream to a file; do not mask IOExceptions. @@ -208,10 +206,17 @@ public class IO try { resource.close(); } catch (Exception ex) { } } + /** Throw a RuntimeIOException - this function is guaraentted not to return normally */ + public static void exception(String message) { + throw new RuntimeIOException(message) ; + } + + /** Throw a RuntimeIOException - this function is guaraentted not to return normally */ public static void exception(IOException ex) { throw new RuntimeIOException(ex) ; } + /** Throw a RuntimeIOException - this function is guaraentted not to return normally */ public static void exception(String msg, IOException ex) { throw new RuntimeIOException(msg, ex) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d666d741/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java index e6d729b..224633f 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java @@ -23,7 +23,6 @@ import java.io.IOException ; import java.io.OutputStream ; import java.io.Writer ; -import org.apache.jena.atlas.RuntimeIOException ; import org.apache.jena.atlas.lib.Closeable ; /** A writer that records what the current indentation level is, and @@ -166,10 +165,10 @@ public class IndentedWriter extends AWriterBase implements AWriter, Closeable } private void write$(char ch) - { try { out.write(ch) ; } catch (IOException ex) { throw new RuntimeIOException(ex) ; } } + { try { out.write(ch) ; } catch (IOException ex) { IO.exception(ex); } } private void write$(String s) - { try { out.write(s) ; } catch (IOException ex) { throw new RuntimeIOException(ex) ; } } + { try { out.write(s) ; } catch (IOException ex) { IO.exception(ex); } } public void newline() { http://git-wip-us.apache.org/repos/asf/jena/blob/d666d741/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java index 4a6403c..c8485e3 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java @@ -27,7 +27,6 @@ import java.io.IOException ; import java.io.InputStream ; import org.apache.jena.atlas.AtlasException ; -import org.apache.jena.atlas.RuntimeIOException ; /** Parsing-centric input stream. * @see PeekReader @@ -177,7 +176,7 @@ public final class PeekInputStream extends InputStream //throw new JenaException("Pushback buffer overflow") ; } if ( b == EOF || b == UNSET ) - throw new RuntimeIOException("Illegal byte to push back: "+b) ; + IO.exception("Illegal byte to push back: "+b) ; idxPushback++ ; pushbackBytes[idxPushback] = (byte)b ; http://git-wip-us.apache.org/repos/asf/jena/blob/d666d741/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java index 31076b0..c45d4c5 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java @@ -24,7 +24,6 @@ import static org.apache.jena.atlas.io.IO.UNSET ; import java.io.* ; import org.apache.jena.atlas.AtlasException ; -import org.apache.jena.atlas.RuntimeIOException ; import org.apache.jena.atlas.lib.Chars ; /** @@ -220,7 +219,7 @@ public final class PeekReader extends Reader { // throw new JenaException("Pushback buffer overflow") ; } if ( ch == EOF || ch == UNSET ) - throw new RuntimeIOException("Illegal character to push back: " + ch) ; + IO.exception("Illegal character to push back: " + ch) ; idxPushback++ ; pushbackChars[idxPushback] = (char)ch ;
