From ce3fceeb101835866224988918b89098157d6e34 Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien@fh-landshut.de>
Date: Thu, 8 Oct 2009 18:18:41 +0200
Subject: gluegen.jar compiles now with source=1.5 classfile version (However,
gluegen-rt.jar still uses 1.4). generified classes in pcpp package and
removed warnings (java 5 cleanup).
---
src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
(limited to 'src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java')
diff --git a/src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java b/src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java
index 11249f7..6da77be 100755
--- a/src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java
+++ b/src/java/com/sun/gluegen/pcpp/ConcatenatingReader.java
@@ -48,16 +48,17 @@ public class ConcatenatingReader extends FilterReader {
// Any leftover characters go here
private char[] curBuf;
private int curPos;
- private BufferedReader in;
+ private BufferedReader reader;
private static String newline = System.getProperty("line.separator");
/** This class requires that the input reader be a BufferedReader so
it can do line-oriented operations. */
public ConcatenatingReader(BufferedReader in) {
super(in);
- this.in = in;
+ this.reader = in;
}
+ @Override
public int read() throws IOException {
char[] tmp = new char[1];
int num = read(tmp, 0, 1);
@@ -67,24 +68,29 @@ public class ConcatenatingReader extends FilterReader {
}
// It's easier not to support mark/reset since we don't need it
+ @Override
public boolean markSupported() {
return false;
}
+ @Override
public void mark(int readAheadLimit) throws IOException {
throw new IOException("mark/reset not supported");
}
+ @Override
public void reset() throws IOException {
throw new IOException("mark/reset not supported");
}
+ @Override
public boolean ready() throws IOException {
- if (curBuf != null || in.ready())
+ if (curBuf != null || reader.ready())
return true;
return false;
}
+ @Override
public int read(char[] cbuf, int off, int len) throws IOException {
if (curBuf == null) {
nextLine();
@@ -110,6 +116,7 @@ public class ConcatenatingReader extends FilterReader {
return numRead;
}
+ @Override
public long skip(long n) throws IOException {
long numSkipped = 0;
@@ -126,7 +133,7 @@ public class ConcatenatingReader extends FilterReader {
}
private void nextLine() throws IOException {
- String cur = in.readLine();
+ String cur = reader.readLine();
if (cur == null) {
curBuf = null;
return;
--
cgit v1.2.3