From 33ac2a8df6e06289c6ac4b36447d645aec53c0ec Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Fri, 1 Jun 2012 11:48:01 +0000
Subject: [PATCH] Clean-up to add @Override annotations for Java 1.6
SVN: 25458
---
.../cisd/base/convert/NativeTaggedArray.java | 11 +++--
.../cisd/base/exceptions/IErrorStrategy.java | 2 +
.../IStreamingImageTransformerFactory.java | 1 +
.../io/AdapterInputStreamToIInputStream.java | 9 ++++
.../AdapterOutputStreamToIOutputStream.java | 6 +++
.../base/io/ByteBufferRandomAccessFile.java | 46 +++++++++++++++++++
.../systemsx/cisd/base/io/IOutputStream.java | 2 +
.../cisd/base/io/IRandomAccessFile.java | 29 ++++++++++++
.../cisd/base/io/RandomAccessFileImpl.java | 46 +++++++++++++++++++
.../cisd/base/mdarray/MDAbstractArray.java | 4 ++
.../base/namedthread/NamedFutureTask.java | 1 +
.../base/namedthread/NamingThreadFactory.java | 1 +
.../NamingThreadPoolExecutorTest.java | 21 +++++++++
13 files changed, 174 insertions(+), 5 deletions(-)
diff --git a/base/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java b/base/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java
index 757c9b49e3f..0948fc837e7 100644
--- a/base/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/convert/NativeTaggedArray.java
@@ -23,6 +23,7 @@ import static ch.systemsx.cisd.base.convert.NativeData.LONG_SIZE;
import static ch.systemsx.cisd.base.convert.NativeData.SHORT_SIZE;
import ch.systemsx.cisd.base.convert.NativeData.ByteOrder;
+import ch.systemsx.cisd.base.mdarray.MDAbstractArray;
import ch.systemsx.cisd.base.mdarray.MDArray;
import ch.systemsx.cisd.base.mdarray.MDDoubleArray;
import ch.systemsx.cisd.base.mdarray.MDFloatArray;
@@ -205,7 +206,7 @@ public class NativeTaggedArray
final int rank = data[RANK_INDEX];
final int[] dimensions = new int[rank];
NativeData.copyByteToInt(data, LENGTH_INDEX, dimensions, 0, rank, encoding.getByteOrder());
- final int length = MDArray.getLength(dimensions);
+ final int length = MDAbstractArray.getLength(dimensions);
final int headerSize = LENGTH_INDEX + rank * LENGTH_SIZE;
if (length * FLOAT_SIZE + headerSize != data.length)
{
@@ -317,7 +318,7 @@ public class NativeTaggedArray
final int rank = data[RANK_INDEX];
final int[] dimensions = new int[rank];
NativeData.copyByteToInt(data, LENGTH_INDEX, dimensions, 0, rank, encoding.getByteOrder());
- final int length = MDArray.getLength(dimensions);
+ final int length = MDAbstractArray.getLength(dimensions);
final int headerSize = LENGTH_INDEX + rank * LENGTH_SIZE;
if (length * DOUBLE_SIZE + headerSize != data.length)
{
@@ -431,7 +432,7 @@ public class NativeTaggedArray
final int rank = data[RANK_INDEX];
final int[] dimensions = new int[rank];
NativeData.copyByteToInt(data, LENGTH_INDEX, dimensions, 0, rank, encoding.getByteOrder());
- final int length = MDArray.getLength(dimensions);
+ final int length = MDAbstractArray.getLength(dimensions);
final int headerSize = LENGTH_INDEX + rank * LENGTH_SIZE;
if (length * SHORT_SIZE + headerSize != data.length)
{
@@ -543,7 +544,7 @@ public class NativeTaggedArray
final int rank = data[RANK_INDEX];
final int[] dimensions = new int[rank];
NativeData.copyByteToInt(data, LENGTH_INDEX, dimensions, 0, rank, encoding.getByteOrder());
- final int length = MDArray.getLength(dimensions);
+ final int length = MDAbstractArray.getLength(dimensions);
final int headerSize = LENGTH_INDEX + rank * LENGTH_SIZE;
if (length * INT_SIZE + headerSize != data.length)
{
@@ -657,7 +658,7 @@ public class NativeTaggedArray
final int rank = data[RANK_INDEX];
final int[] dimensions = new int[rank];
NativeData.copyByteToInt(data, LENGTH_INDEX, dimensions, 0, rank, encoding.getByteOrder());
- final int length = MDArray.getLength(dimensions);
+ final int length = MDAbstractArray.getLength(dimensions);
final int headerSize = LENGTH_INDEX + rank * LENGTH_SIZE;
if (length * LONG_SIZE + headerSize != data.length)
{
diff --git a/base/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java b/base/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java
index d3d8c94a034..cfd17ee2f1c 100644
--- a/base/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java
+++ b/base/source/java/ch/systemsx/cisd/base/exceptions/IErrorStrategy.java
@@ -28,11 +28,13 @@ public interface IErrorStrategy
*/
public static final IErrorStrategy DEFAULT_ERROR_STRATEGY = new IErrorStrategy()
{
+ @Override
public void dealWithError(Throwable th) throws RuntimeException, Error
{
throw CheckedExceptionTunnel.wrapIfNecessary(th);
}
+ @Override
public void warning(String message)
{
System.err.println(message);
diff --git a/base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java b/base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java
index b446c505831..61c481a8dd5 100644
--- a/base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java
+++ b/base/source/java/ch/systemsx/cisd/base/image/IStreamingImageTransformerFactory.java
@@ -29,5 +29,6 @@ public interface IStreamingImageTransformerFactory extends IImageTransformerFact
/**
* Creates a transformer object based on the attributes of the factory.
*/
+ @Override
public IStreamingImageTransformer createTransformer();
}
diff --git a/base/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java b/base/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java
index f3a506ef874..c9e46a5ee44 100644
--- a/base/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java
+++ b/base/source/java/ch/systemsx/cisd/base/io/AdapterInputStreamToIInputStream.java
@@ -36,6 +36,7 @@ public class AdapterInputStreamToIInputStream implements IInputStream
this.delegate = delegate;
}
+ @Override
public int available() throws IOExceptionUnchecked
{
try
@@ -47,6 +48,7 @@ public class AdapterInputStreamToIInputStream implements IInputStream
}
}
+ @Override
public void close() throws IOExceptionUnchecked
{
try
@@ -58,16 +60,19 @@ public class AdapterInputStreamToIInputStream implements IInputStream
}
}
+ @Override
public void mark(int readlimit)
{
delegate.mark(readlimit);
}
+ @Override
public boolean markSupported()
{
return delegate.markSupported();
}
+ @Override
public int read() throws IOExceptionUnchecked
{
try
@@ -79,6 +84,7 @@ public class AdapterInputStreamToIInputStream implements IInputStream
}
}
+ @Override
public int read(byte[] b, int off, int len) throws IOExceptionUnchecked
{
try
@@ -90,6 +96,7 @@ public class AdapterInputStreamToIInputStream implements IInputStream
}
}
+ @Override
public int read(byte[] b) throws IOExceptionUnchecked
{
try
@@ -101,6 +108,7 @@ public class AdapterInputStreamToIInputStream implements IInputStream
}
}
+ @Override
public void reset() throws IOExceptionUnchecked
{
try
@@ -112,6 +120,7 @@ public class AdapterInputStreamToIInputStream implements IInputStream
}
}
+ @Override
public long skip(long n) throws IOExceptionUnchecked
{
try
diff --git a/base/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java b/base/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java
index 02217793a5a..0720195778b 100644
--- a/base/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java
+++ b/base/source/java/ch/systemsx/cisd/base/io/AdapterOutputStreamToIOutputStream.java
@@ -39,6 +39,7 @@ public class AdapterOutputStreamToIOutputStream implements IOutputStream
// IOutputStream
//
+ @Override
public void write(byte[] b, int off, int len) throws IOExceptionUnchecked
{
try
@@ -50,6 +51,7 @@ public class AdapterOutputStreamToIOutputStream implements IOutputStream
}
}
+ @Override
public void write(byte[] b) throws IOExceptionUnchecked
{
try
@@ -61,6 +63,7 @@ public class AdapterOutputStreamToIOutputStream implements IOutputStream
}
}
+ @Override
public void write(int b) throws IOExceptionUnchecked
{
try
@@ -72,6 +75,7 @@ public class AdapterOutputStreamToIOutputStream implements IOutputStream
}
}
+ @Override
public void close() throws IOExceptionUnchecked
{
try
@@ -83,6 +87,7 @@ public class AdapterOutputStreamToIOutputStream implements IOutputStream
}
}
+ @Override
public void flush() throws IOExceptionUnchecked
{
try
@@ -94,6 +99,7 @@ public class AdapterOutputStreamToIOutputStream implements IOutputStream
}
}
+ @Override
public void synchronize() throws IOExceptionUnchecked
{
flush();
diff --git a/base/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java b/base/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java
index d5d6a0eb56c..1055b8b0ae1 100644
--- a/base/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java
+++ b/base/source/java/ch/systemsx/cisd/base/io/ByteBufferRandomAccessFile.java
@@ -105,21 +105,25 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
setLength(0);
}
+ @Override
public ByteOrder getByteOrder()
{
return buf.order();
}
+ @Override
public void setByteOrder(ByteOrder byteOrder)
{
buf.order(byteOrder);
}
+ @Override
public void readFully(byte[] b) throws IOExceptionUnchecked
{
readFully(b, 0, b.length);
}
+ @Override
public void readFully(byte[] b, int off, int len) throws IOExceptionUnchecked
{
if (available0() == -1)
@@ -131,6 +135,7 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
}
}
+ @Override
public int skipBytes(int n) throws IOExceptionUnchecked
{
if (n <= 0)
@@ -144,21 +149,25 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
return (newpos - pos);
}
+ @Override
public void close() throws IOExceptionUnchecked
{
// NOOP
}
+ @Override
public int read() throws IOExceptionUnchecked
{
return buf.get() & 0xff;
}
+ @Override
public int read(byte[] b) throws IOExceptionUnchecked
{
return read(b, 0, b.length);
}
+ @Override
public int read(byte[] b, int off, int len) throws IOExceptionUnchecked
{
final int bytesRead = Math.min(available0(), len);
@@ -170,6 +179,7 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
return bytesRead;
}
+ @Override
public long skip(long n) throws IOExceptionUnchecked
{
if (n > Integer.MAX_VALUE)
@@ -184,101 +194,121 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
return (buf.remaining() == 0) ? -1 : buf.remaining();
}
+ @Override
public int available() throws IOExceptionUnchecked
{
return buf.remaining();
}
+ @Override
public void mark(int readlimit)
{
buf.mark();
}
+ @Override
public void reset() throws IOExceptionUnchecked
{
buf.reset();
}
+ @Override
public boolean markSupported()
{
return true;
}
+ @Override
public void flush() throws IOExceptionUnchecked
{
// NOOP
}
+ @Override
public void synchronize() throws IOExceptionUnchecked
{
// NOOP
}
+ @Override
public long getFilePointer() throws IOExceptionUnchecked
{
return buf.position();
}
+ @Override
public void seek(long pos) throws IOExceptionUnchecked
{
buf.position((int) pos);
}
+ @Override
public long length() throws IOExceptionUnchecked
{
return buf.limit();
}
+ @Override
public void setLength(long newLength) throws IOExceptionUnchecked
{
buf.limit((int) newLength);
}
+ @Override
public boolean readBoolean() throws IOExceptionUnchecked
{
return buf.get() != 0;
}
+ @Override
public byte readByte() throws IOExceptionUnchecked
{
return buf.get();
}
+ @Override
public int readUnsignedByte() throws IOExceptionUnchecked
{
return buf.get() & 0xff;
}
+ @Override
public short readShort() throws IOExceptionUnchecked
{
return buf.getShort();
}
+ @Override
public int readUnsignedShort() throws IOExceptionUnchecked
{
return buf.getShort() & 0xffff;
}
+ @Override
public char readChar() throws IOExceptionUnchecked
{
return buf.getChar();
}
+ @Override
public int readInt() throws IOExceptionUnchecked
{
return buf.getInt();
}
+ @Override
public long readLong() throws IOExceptionUnchecked
{
return buf.getLong();
}
+ @Override
public float readFloat() throws IOExceptionUnchecked
{
return buf.getFloat();
}
+ @Override
public double readDouble() throws IOExceptionUnchecked
{
return buf.getDouble();
@@ -287,11 +317,13 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
/**
* @throws UnsupportedOperationException
*/
+ @Override
public String readLine() throws UnsupportedOperationException
{
throw new UnsupportedOperationException();
}
+ @Override
public String readUTF()
{
try
@@ -305,71 +337,83 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
}
}
+ @Override
public void write(int b) throws IOExceptionUnchecked
{
addToLength(1);
buf.put((byte) b);
}
+ @Override
public void write(byte[] b) throws IOExceptionUnchecked
{
addToLength(b.length);
buf.put(b);
}
+ @Override
public void write(byte[] b, int off, int len) throws IOExceptionUnchecked
{
addToLength(len);
buf.put(b, off, len);
}
+ @Override
public void writeBoolean(boolean v) throws IOExceptionUnchecked
{
addToLength(1);
buf.put((byte) (v ? 1 : 0));
}
+ @Override
public void writeByte(int v) throws IOExceptionUnchecked
{
write((byte) v);
}
+ @Override
public void writeShort(int v) throws IOExceptionUnchecked
{
addToLength(NativeData.SHORT_SIZE);
buf.putShort((short) v);
}
+ @Override
public void writeChar(int v) throws IOExceptionUnchecked
{
addToLength(NativeData.CHAR_SIZE);
buf.putChar((char) v);
}
+ @Override
public void writeInt(int v) throws IOExceptionUnchecked
{
addToLength(NativeData.INT_SIZE);
buf.putInt(v);
}
+ @Override
public void writeLong(long v) throws IOExceptionUnchecked
{
addToLength(NativeData.LONG_SIZE);
buf.putLong(v);
}
+ @Override
public void writeFloat(float v) throws IOExceptionUnchecked
{
addToLength(NativeData.FLOAT_SIZE);
buf.putFloat(v);
}
+ @Override
public void writeDouble(double v) throws IOExceptionUnchecked
{
addToLength(NativeData.DOUBLE_SIZE);
buf.putDouble(v);
}
+ @Override
public void writeBytes(String s) throws IOExceptionUnchecked
{
final int len = s.length();
@@ -380,6 +424,7 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
}
}
+ @Override
public void writeChars(String s) throws IOExceptionUnchecked
{
final int len = s.length();
@@ -392,6 +437,7 @@ public class ByteBufferRandomAccessFile implements IRandomAccessFile
}
}
+ @Override
public void writeUTF(String str) throws UnsupportedOperationException
{
try
diff --git a/base/source/java/ch/systemsx/cisd/base/io/IOutputStream.java b/base/source/java/ch/systemsx/cisd/base/io/IOutputStream.java
index cabc216f283..7445d49595d 100644
--- a/base/source/java/ch/systemsx/cisd/base/io/IOutputStream.java
+++ b/base/source/java/ch/systemsx/cisd/base/io/IOutputStream.java
@@ -48,11 +48,13 @@ public interface IOutputStream extends ICloseable, ISynchronizable
/**
* @see java.io.OutputStream#flush()
*/
+ @Override
public void synchronize() throws IOExceptionUnchecked;
/**
* @see java.io.OutputStream#close()
*/
+ @Override
public void close() throws IOExceptionUnchecked;
}
diff --git a/base/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java b/base/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java
index f667a784304..8cd83ec1150 100644
--- a/base/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java
+++ b/base/source/java/ch/systemsx/cisd/base/io/IRandomAccessFile.java
@@ -101,76 +101,91 @@ public interface IRandomAccessFile extends DataInput, DataOutput, Closeable, IIn
/**
* @see DataInput#readFully(byte[])
*/
+ @Override
public void readFully(byte b[]) throws IOExceptionUnchecked;
/**
* @see DataInput#readFully(byte[], int, int)
*/
+ @Override
public void readFully(byte b[], int off, int len) throws IOExceptionUnchecked;
/**
* @see DataInput#skipBytes(int)
*/
+ @Override
public int skipBytes(int n) throws IOExceptionUnchecked;
/**
* @see DataInput#readBoolean()
*/
+ @Override
public boolean readBoolean() throws IOExceptionUnchecked;
/**
* @see DataInput#readByte()
*/
+ @Override
public byte readByte() throws IOExceptionUnchecked;
/**
* @see DataInput#readUnsignedByte()
*/
+ @Override
public int readUnsignedByte() throws IOExceptionUnchecked;
/**
* @see DataInput#readShort()
*/
+ @Override
public short readShort() throws IOExceptionUnchecked;
/**
* @see DataInput#readUnsignedShort()
*/
+ @Override
public int readUnsignedShort() throws IOExceptionUnchecked;
/**
* @see DataInput#readChar()
*/
+ @Override
public char readChar() throws IOExceptionUnchecked;
/**
* @see DataInput#readInt()
*/
+ @Override
public int readInt() throws IOExceptionUnchecked;
/**
* @see DataInput#readLong()
*/
+ @Override
public long readLong() throws IOExceptionUnchecked;
/**
* @see DataInput#readFloat()
*/
+ @Override
public float readFloat() throws IOExceptionUnchecked;
/**
* @see DataInput#readDouble()
*/
+ @Override
public double readDouble() throws IOExceptionUnchecked;
/**
* @see DataInput#readLine()
*/
+ @Override
public String readLine() throws IOExceptionUnchecked;
/**
* @see DataInput#readUTF()
*/
+ @Override
public String readUTF() throws IOExceptionUnchecked;
//
@@ -180,70 +195,84 @@ public interface IRandomAccessFile extends DataInput, DataOutput, Closeable, IIn
/**
* @see DataOutput#write(int)
*/
+ @Override
public void write(int b) throws IOExceptionUnchecked;
/**
* @see DataOutput#write(byte[])
*/
+ @Override
public void write(byte b[]) throws IOExceptionUnchecked;
/**
* @see DataOutput#write(byte[], int, int)
*/
+ @Override
public void write(byte b[], int off, int len) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeBoolean(boolean)
*/
+ @Override
public void writeBoolean(boolean v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeByte(int)
*/
+ @Override
public void writeByte(int v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeShort(int)
*/
+ @Override
public void writeShort(int v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeChar(int)
*/
+ @Override
public void writeChar(int v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeInt(int)
*/
+ @Override
public void writeInt(int v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeLong(long)
*/
+ @Override
public void writeLong(long v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeFloat(float)
*/
+ @Override
public void writeFloat(float v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeDouble(double)
*/
+ @Override
public void writeDouble(double v) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeBytes(String)
*/
+ @Override
public void writeBytes(String s) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeChars(String)
*/
+ @Override
public void writeChars(String s) throws IOExceptionUnchecked;
/**
* @see DataOutput#writeUTF(String)
*/
+ @Override
public void writeUTF(String str) throws IOExceptionUnchecked;
}
diff --git a/base/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java b/base/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java
index b05631c9f65..e5f1ce79ed5 100644
--- a/base/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java
+++ b/base/source/java/ch/systemsx/cisd/base/io/RandomAccessFileImpl.java
@@ -82,17 +82,20 @@ public class RandomAccessFileImpl implements IRandomAccessFile
return randomAccessFile.getChannel();
}
+ @Override
public ByteOrder getByteOrder()
{
return byteOrder;
}
+ @Override
public void setByteOrder(ByteOrder byteOrder)
{
this.byteOrder = byteOrder;
this.changeByteOrder = ByteOrder.LITTLE_ENDIAN.equals(byteOrder);
}
+ @Override
public int read() throws IOExceptionUnchecked
{
try
@@ -104,6 +107,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public int read(byte[] b, int off, int len) throws IOExceptionUnchecked
{
try
@@ -115,6 +119,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public int read(byte[] b) throws IOExceptionUnchecked
{
try
@@ -126,6 +131,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void readFully(byte[] b) throws IOExceptionUnchecked
{
try
@@ -137,6 +143,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void readFully(byte[] b, int off, int len) throws IOExceptionUnchecked
{
try
@@ -148,6 +155,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public int skipBytes(int n) throws IOExceptionUnchecked
{
try
@@ -159,6 +167,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void write(int b) throws IOExceptionUnchecked
{
try
@@ -170,6 +179,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void write(byte[] b) throws IOExceptionUnchecked
{
try
@@ -181,6 +191,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void write(byte[] b, int off, int len) throws IOExceptionUnchecked
{
try
@@ -192,6 +203,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public long getFilePointer() throws IOExceptionUnchecked
{
try
@@ -203,6 +215,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void seek(long pos) throws IOExceptionUnchecked
{
try
@@ -214,6 +227,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public long length() throws IOExceptionUnchecked
{
try
@@ -225,6 +239,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void setLength(long newLength) throws IOExceptionUnchecked
{
try
@@ -236,6 +251,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void close() throws IOExceptionUnchecked
{
try
@@ -247,6 +263,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final boolean readBoolean() throws IOExceptionUnchecked
{
try
@@ -258,6 +275,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final byte readByte() throws IOExceptionUnchecked
{
try
@@ -269,6 +287,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final int readUnsignedByte() throws IOExceptionUnchecked
{
try
@@ -280,6 +299,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final short readShort() throws IOExceptionUnchecked
{
try
@@ -292,11 +312,13 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final int readUnsignedShort() throws IOExceptionUnchecked
{
return readShort() & 0xffff;
}
+ @Override
public final char readChar() throws IOExceptionUnchecked
{
try
@@ -309,6 +331,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final int readInt() throws IOExceptionUnchecked
{
try
@@ -321,6 +344,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final long readLong() throws IOExceptionUnchecked
{
try
@@ -333,6 +357,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final float readFloat() throws IOExceptionUnchecked
{
try
@@ -345,6 +370,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final double readDouble() throws IOExceptionUnchecked
{
try
@@ -357,6 +383,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final String readLine() throws IOExceptionUnchecked
{
try
@@ -368,6 +395,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final String readUTF() throws IOExceptionUnchecked
{
try
@@ -379,6 +407,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeBoolean(boolean v) throws IOExceptionUnchecked
{
try
@@ -390,6 +419,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeByte(int v) throws IOExceptionUnchecked
{
try
@@ -401,6 +431,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeShort(int v) throws IOExceptionUnchecked
{
try
@@ -412,6 +443,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeChar(int v) throws IOExceptionUnchecked
{
try
@@ -423,6 +455,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeInt(int v) throws IOExceptionUnchecked
{
try
@@ -434,6 +467,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeLong(long v) throws IOExceptionUnchecked
{
try
@@ -445,6 +479,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeFloat(float v) throws IOExceptionUnchecked
{
try
@@ -456,6 +491,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeDouble(double v) throws IOExceptionUnchecked
{
try
@@ -467,6 +503,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeBytes(String s) throws IOExceptionUnchecked
{
try
@@ -478,6 +515,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeChars(String s) throws IOExceptionUnchecked
{
try
@@ -489,6 +527,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public final void writeUTF(String str) throws IOExceptionUnchecked
{
try
@@ -500,6 +539,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public long skip(long n) throws IOExceptionUnchecked
{
if (n <= 0)
@@ -519,6 +559,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public int available() throws IOExceptionUnchecked
{
try
@@ -530,6 +571,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void mark(int readlimit)
{
try
@@ -541,6 +583,7 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public void reset() throws IOExceptionUnchecked
{
if (markedPosition == -1)
@@ -556,16 +599,19 @@ public class RandomAccessFileImpl implements IRandomAccessFile
}
}
+ @Override
public boolean markSupported()
{
return true;
}
+ @Override
public void flush() throws IOExceptionUnchecked
{
// NOOP
}
+ @Override
public void synchronize() throws IOExceptionUnchecked
{
try
diff --git a/base/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java b/base/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java
index 4c11abfe31b..d2dd8382901 100644
--- a/base/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java
+++ b/base/source/java/ch/systemsx/cisd/base/mdarray/MDAbstractArray.java
@@ -420,17 +420,20 @@ public abstract class MDAbstractArray<T> implements Serializable,
// Iterable
//
+ @Override
public Iterator<ArrayEntry> iterator()
{
return new Iterator<ArrayEntry>()
{
int linearIndex = 0;
+ @Override
public boolean hasNext()
{
return linearIndex < size;
}
+ @Override
public ArrayEntry next()
{
final ArrayEntry next = new ArrayEntry(linearIndex);
@@ -438,6 +441,7 @@ public abstract class MDAbstractArray<T> implements Serializable,
return next;
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException();
diff --git a/base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
index fb93c560e05..7114e2a97eb 100644
--- a/base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
@@ -63,6 +63,7 @@ class NamedFutureTask<V> extends FutureTask<V> implements NamedRunnable
this.oldThreadName = thread.getName();
}
+ @Override
public String getRunnableName()
{
return name;
diff --git a/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
index c32e7267ffe..f74e529556a 100644
--- a/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
@@ -46,6 +46,7 @@ public class NamingThreadFactory implements ThreadFactory
this.threadCount = 0;
}
+ @Override
public Thread newThread(Runnable r)
{
++threadCount;
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java b/base/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java
index a5e25632c04..a9f73859135 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutorTest.java
@@ -58,6 +58,7 @@ public class NamingThreadPoolExecutorTest
assertEquals(2, eservice.getMaximumPoolSize());
final Future<?> future = eservice.submit(new Runnable()
{
+ @Override
public void run()
{
assertEquals(name + "-T1", Thread.currentThread().getName());
@@ -109,6 +110,7 @@ public class NamingThreadPoolExecutorTest
new NamingThreadPoolExecutor(name).corePoolSize(1).maximumPoolSize(2);
final ThreadFactory factory = new ThreadFactory()
{
+ @Override
public Thread newThread(Runnable r)
{
return null; // Doesn't matter, never used
@@ -137,6 +139,7 @@ public class NamingThreadPoolExecutorTest
{
futureSet.add(eservice.submit(new Runnable()
{
+ @Override
public void run()
{
threadNameSet.add(Thread.currentThread().getName());
@@ -173,11 +176,13 @@ public class NamingThreadPoolExecutorTest
assertEquals(1, eservice.getMaximumPoolSize());
final Future<?> future = eservice.submit(new NamedRunnable()
{
+ @Override
public void run()
{
assertEquals(name + "-T1::" + runnableName, Thread.currentThread().getName());
}
+ @Override
public String getRunnableName()
{
return runnableName;
@@ -203,12 +208,14 @@ public class NamingThreadPoolExecutorTest
final Semaphore sem = new Semaphore(0);
eservice.execute(new NamedRunnable()
{
+ @Override
public void run()
{
assertEquals(name + "-T1::" + runnableName, Thread.currentThread().getName());
sem.release();
}
+ @Override
public String getRunnableName()
{
return runnableName;
@@ -232,12 +239,14 @@ public class NamingThreadPoolExecutorTest
final Semaphore sem = new Semaphore(0);
eservice.execute(new MyRunnable()
{
+ @Override
public void run()
{
assertEquals(name + "-T1::" + runnableName, Thread.currentThread().getName());
sem.release();
}
+ @Override
public String getRunnableName()
{
return runnableName;
@@ -256,12 +265,14 @@ public class NamingThreadPoolExecutorTest
assertEquals(1, eservice.getMaximumPoolSize());
final Future<?> future = eservice.submit(new NamedCallable<Object>()
{
+ @Override
public Object call() throws Exception
{
assertEquals(name + "-T1::" + callableName, Thread.currentThread().getName());
return null;
}
+ @Override
public String getCallableName()
{
return callableName;
@@ -290,12 +301,14 @@ public class NamingThreadPoolExecutorTest
assertEquals(1, eservice.getMaximumPoolSize());
final Future<?> future = eservice.submit(new MyCallable()
{
+ @Override
public Object call() throws Exception
{
assertEquals(name + "-T1::" + callableName, Thread.currentThread().getName());
return null;
}
+ @Override
public String getCallableName()
{
return callableName;
@@ -320,12 +333,14 @@ public class NamingThreadPoolExecutorTest
assertEquals(1, eservice.getMaximumPoolSize());
final Future<?> future1 = eservice.submit(new NamedCallable<Object>()
{
+ @Override
public Object call() throws Exception
{
assertEquals(name + "-T1::" + callableName1, Thread.currentThread().getName());
return null;
}
+ @Override
public String getCallableName()
{
return callableName1;
@@ -343,12 +358,14 @@ public class NamingThreadPoolExecutorTest
final String callableName2 = "This is the second special callable name";
final Future<?> future2 = eservice.submit(new NamedCallable<Object>()
{
+ @Override
public Object call() throws Exception
{
assertEquals(name + "-T1::" + callableName2, Thread.currentThread().getName());
return null;
}
+ @Override
public String getCallableName()
{
return callableName2;
@@ -374,6 +391,7 @@ public class NamingThreadPoolExecutorTest
assertEquals(1, eservice.getMaximumPoolSize());
final Future<?> future1 = eservice.submit(new NamedCallable<Object>()
{
+ @Override
public Object call() throws Exception
{
assertEquals(name + "-T1::" + callableName1, Thread.currentThread().getName());
@@ -381,6 +399,7 @@ public class NamingThreadPoolExecutorTest
return null;
}
+ @Override
public String getCallableName()
{
return callableName1;
@@ -388,6 +407,7 @@ public class NamingThreadPoolExecutorTest
});
final Future<?> future2 = eservice.submit(new NamedCallable<Object>()
{
+ @Override
public Object call() throws Exception
{
assertEquals(name + "-T1::" + callableName1, Thread.currentThread().getName());
@@ -395,6 +415,7 @@ public class NamingThreadPoolExecutorTest
return null;
}
+ @Override
public String getCallableName()
{
return callableName1;
--
GitLab