X-Git-Url: http://source.jalview.org/gitweb/?p=jalviewjs.git;a=blobdiff_plain;f=src%2Fjavajs%2Futil%2FDataReader.java;fp=src%2Fjavajs%2Futil%2FDataReader.java;h=1eb8ade3914dd1d12ed654b4383323241b5de9ba;hp=21d0699b725c635f8de31ed5e87837c1d1525450;hb=b9b7a352eee79b7764c3b09c9d19663075061d8c;hpb=7301a2415adab88038b291fc54caeeb3a5a47a44 diff --git a/src/javajs/util/DataReader.java b/src/javajs/util/DataReader.java index 21d0699..1eb8ade 100644 --- a/src/javajs/util/DataReader.java +++ b/src/javajs/util/DataReader.java @@ -1,56 +1,56 @@ -package javajs.util; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; - -/** - * Just a simple abstract class to join a String reader and a String[] - * reader under the same BufferedReader umbrella. - * - * Subclassed as StringDataReader, ArrayDataReader, and ListDataReader - * - */ - -public abstract class DataReader extends BufferedReader { - - public abstract DataReader setData(Object data); - - protected int ptMark; - - public DataReader() { - super(new StringReader("")); - } - - protected DataReader(Reader in) { - super(in); - } - - public BufferedReader getBufferedReader() { - return this; - } - - protected int readBuf(char[] buf, int off, int len) throws IOException { - // not used by StringDataReader - int nRead = 0; - String line = readLine(); - if (line == null) - return 0; - int linept = 0; - int linelen = line.length(); - for (int i = off; i < len && linelen >= 0; i++) { - if (linept >= linelen) { - linept = 0; - buf[i] = '\n'; - line = readLine(); - linelen = (line == null ? -1 : line.length()); - } else { - buf[i] = line.charAt(linept++); - } - nRead++; - } - return nRead; - } - +package javajs.util; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; + +/** + * Just a simple abstract class to join a String reader and a String[] + * reader under the same BufferedReader umbrella. + * + * Subclassed as StringDataReader, ArrayDataReader, and ListDataReader + * + */ + +public abstract class DataReader extends BufferedReader { + + public abstract DataReader setData(Object data); + + protected int ptMark; + + public DataReader() { + super(new StringReader("")); + } + + protected DataReader(Reader in) { + super(in); + } + + public BufferedReader getBufferedReader() { + return this; + } + + protected int readBuf(char[] buf, int off, int len) throws IOException { + // not used by StringDataReader + int nRead = 0; + String line = readLine(); + if (line == null) + return 0; + int linept = 0; + int linelen = line.length(); + for (int i = off; i < len && linelen >= 0; i++) { + if (linept >= linelen) { + linept = 0; + buf[i] = '\n'; + line = readLine(); + linelen = (line == null ? -1 : line.length()); + } else { + buf[i] = line.charAt(linept++); + } + nRead++; + } + return nRead; + } + } \ No newline at end of file