You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/10/19 14:15:16 UTC
svn commit: r1186146 [7/9] - in /incubator/jena/Jena2/ARQ/trunk: ./
.settings/ src-examples/arq/examples/bgpmatching/
src-examples/arq/examples/engine/ src-examples/arq/examples/filter/
src-examples/arq/examples/propertyfunction/ src/main/java/arq/ src...
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/SortedDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/SortedDataBag.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/SortedDataBag.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/SortedDataBag.java Wed Oct 19 12:15:05 2011
@@ -84,16 +84,19 @@ public class SortedDataBag<E> extends Ab
if (closed) throw new AtlasException("SortedDataBag is closed, no operations can be performed on it.") ;
}
+ @Override
public boolean isSorted()
{
return true;
}
+ @Override
public boolean isDistinct()
{
return false;
}
+ @Override
public void add(E item)
{
checkClosed();
@@ -155,6 +158,7 @@ public class SortedDataBag<E> extends Ab
}
}
+ @Override
public void flush()
{
spill();
@@ -167,6 +171,7 @@ public class SortedDataBag<E> extends Ab
*
* @return an Iterator
*/
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Iterator<E> iterator()
{
@@ -234,6 +239,7 @@ public class SortedDataBag<E> extends Ab
}
}
+ @Override
public void close()
{
if (!closed)
@@ -278,11 +284,13 @@ public class SortedDataBag<E> extends Ab
}
}
+ @Override
public boolean hasNext()
{
return (minHeap.peek() != null);
}
+ @Override
public T next()
{
if (!hasNext())
@@ -297,11 +305,13 @@ public class SortedDataBag<E> extends Ab
return curr.getTuple();
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException("SpillSortIterator.remove");
}
+ @Override
public void close()
{
for (Iterator<T> it : inputs)
@@ -333,6 +343,7 @@ public class SortedDataBag<E> extends Ab
return tuple;
}
+ @Override
@SuppressWarnings("unchecked")
public int compareTo(Item<U> o)
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyCount.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyCount.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyCount.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyCount.java Wed Oct 19 12:15:05 2011
@@ -39,6 +39,7 @@ public class ThresholdPolicyCount<T> imp
/* (non-Javadoc)
* @see org.openjena.atlas.io.ThresholdPolicy#increment(java.lang.Object)
*/
+ @Override
public void increment(T item)
{
count++;
@@ -47,6 +48,7 @@ public class ThresholdPolicyCount<T> imp
/* (non-Javadoc)
* @see org.openjena.atlas.io.ThresholdPolicy#isThresholdExceeded()
*/
+ @Override
public boolean isThresholdExceeded()
{
return (count >= threshold);
@@ -56,6 +58,7 @@ public class ThresholdPolicyCount<T> imp
* (non-Javadoc)
* @see org.openjena.atlas.data.ThresholdPolicy#reset()
*/
+ @Override
public void reset()
{
count = 0;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyMemory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyMemory.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyMemory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyMemory.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class ThresholdPolicyMemory<T> im
/* (non-Javadoc)
* @see org.openjena.atlas.io.ThresholdPolicy#increment(java.lang.Object)
*/
+ @Override
public void increment(T item)
{
count++;
@@ -58,6 +59,7 @@ public class ThresholdPolicyMemory<T> im
/* (non-Javadoc)
* @see org.openjena.atlas.io.ThresholdPolicy#isThresholdExceeded()
*/
+ @Override
public boolean isThresholdExceeded()
{
return (size >= threshold);
@@ -67,6 +69,7 @@ public class ThresholdPolicyMemory<T> im
* (non-Javadoc)
* @see org.openjena.atlas.data.ThresholdPolicy#reset()
*/
+ @Override
public void reset()
{
count = 0;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyNever.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyNever.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyNever.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/ThresholdPolicyNever.java Wed Oct 19 12:15:05 2011
@@ -31,6 +31,7 @@ public class ThresholdPolicyNever<T> imp
/* (non-Javadoc)
* @see org.openjena.atlas.io.ThresholdPolicy#increment(java.lang.Object)
*/
+ @Override
public void increment(T item)
{
// Do nothing
@@ -39,6 +40,7 @@ public class ThresholdPolicyNever<T> imp
/* (non-Javadoc)
* @see org.openjena.atlas.io.ThresholdPolicy#isThresholdExceeded()
*/
+ @Override
public boolean isThresholdExceeded()
{
return false ;
@@ -48,6 +50,7 @@ public class ThresholdPolicyNever<T> imp
* (non-Javadoc)
* @see org.openjena.atlas.data.ThresholdPolicy#reset()
*/
+ @Override
public void reset()
{
// Do nothing
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/BufferingWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/BufferingWriter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/BufferingWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/BufferingWriter.java Wed Oct 19 12:15:05 2011
@@ -221,15 +221,15 @@ public final class BufferingWriter exten
public SinkChannel(WritableByteChannel out)
{ this.out = out ; }
- //@Override
+ @Override
public void send(ByteBuffer bb)
{ try { out.write(bb) ; } catch (IOException ex) { exception(ex) ; } }
- //@Override
+ @Override
public void close()
{ try { out.close() ; } catch (IOException ex) { exception(ex) ; } }
- //@Override
+ @Override
public void flush()
{ }
}
@@ -241,15 +241,15 @@ public final class BufferingWriter exten
public SinkBuffer(ByteBuffer out)
{ this.out = out ; }
- //@Override
+ @Override
public void send(ByteBuffer bb)
{ out.put(bb) ; }
- //@Override
+ @Override
public void close()
{ }
- //@Override
+ @Override
public void flush()
{ }
}
@@ -261,15 +261,15 @@ public final class BufferingWriter exten
public SinkOutputStream(OutputStream out)
{ this.out = out ; }
- //@Override
+ @Override
public void send(ByteBuffer bb)
{ try { out.write(bb.array(), 0, bb.limit()) ; } catch (IOException ex) { exception(ex) ; } }
- //@Override
+ @Override
public void close()
{ try { out.close(); } catch (IOException ex) { exception(ex) ; } }
- //@Override
+ @Override
public void flush()
{ try { out.flush() ; } catch (IOException ex) { exception(ex) ; } }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamBuffered.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamBuffered.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamBuffered.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamBuffered.java Wed Oct 19 12:15:05 2011
@@ -67,13 +67,13 @@ public final class CharStreamBuffered ex
final Reader reader ;
SourceReader(Reader r) { reader = r ; }
- //@Override
+ @Override
public void close()
{
try { reader.close() ; } catch (IOException ex) { IO.exception(ex) ; }
}
- //@Override
+ @Override
public int fill(char[] array)
{
try { return reader.read(array) ; } catch (IOException ex) { IO.exception(ex) ; return -1 ; }
@@ -112,13 +112,13 @@ public final class CharStreamBuffered ex
// CharsetDecoder decoder = Chars.createDecoder() ;
// SourceChannel(ReadableByteChannel r) { channel = r ; }
//
-// //@Override
+// @Override
// public void close()
// {
// try { channel.close() ; } catch (IOException ex) { exception(ex) ; }
// }
//
-// //@Override
+// @Override
// public int fill(char[] array)
// {
// // Encoding foo.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamReader.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamReader.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamReader.java Wed Oct 19 12:15:05 2011
@@ -48,7 +48,9 @@ public abstract class CharStreamReader e
public void close() throws IOException
{ closeStream() ; }
+ @Override
public abstract int advance() ;
+ @Override
public abstract void closeStream() ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamSequence.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamSequence.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamSequence.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/CharStreamSequence.java Wed Oct 19 12:15:05 2011
@@ -31,7 +31,7 @@ public final class CharStreamSequence im
this.idx = 0 ;
}
- //@Override
+ @Override
public int advance()
{
if ( idx >= string.length() )
@@ -39,7 +39,7 @@ public final class CharStreamSequence im
return string.charAt(idx++);
}
- //@Override
+ @Override
public void closeStream()
{
string = null ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamASCII.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamASCII.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamASCII.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamASCII.java Wed Oct 19 12:15:05 2011
@@ -53,7 +53,7 @@ public final class InStreamASCII extends
public void close() throws IOException
{ input.close() ; }
- //@Override
+ @Override
public void closeStream()
{ IO.close(input) ; }
@@ -80,6 +80,7 @@ public final class InStreamASCII extends
public int read() throws IOException
{ return advance() ; }
+ @Override
public int advance()
{
count++ ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamUTF8.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamUTF8.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamUTF8.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InStreamUTF8.java Wed Oct 19 12:15:05 2011
@@ -108,7 +108,7 @@ public final class InStreamUTF8 extends
public void close() throws IOException
{ input.close() ; }
- //@Override
+ @Override
public void closeStream()
{ IO.close(input) ; }
@@ -142,6 +142,7 @@ public final class InStreamUTF8 extends
/** Next codepoint, given the first byte of any UTF-8 byte sequence is already known.
* Not necessarily a valid char (this function can be used a straight UTF8 decoder
*/
+ @Override
public final int advance()
{ return advance(input) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InputStreamBuffered.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InputStreamBuffered.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InputStreamBuffered.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/io/InputStreamBuffered.java Wed Oct 19 12:15:05 2011
@@ -70,7 +70,6 @@ public final class InputStreamBuffered e
source.close() ;
}
- //@Override
public final int advance()
{
if ( idx >= buffLen )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/AccString.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/AccString.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/AccString.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/AccString.java Wed Oct 19 12:15:05 2011
@@ -28,6 +28,7 @@ public class AccString<T> implements Acc
public AccString(String sep) { this.sep = sep ; }
public AccString() { this(" ") ; }
+ @Override
public void accumulate(T item)
{
if ( ! first )
@@ -45,11 +46,13 @@ public class AccString<T> implements Acc
return item.toString() ;
}
+ @Override
public String get()
{
return buffer.toString() ;
}
+ @Override
public void start()
{
// Resets on each use.
@@ -57,6 +60,7 @@ public class AccString<T> implements Acc
first = true ;
}
+ @Override
public void finish() {}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionCount.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionCount.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionCount.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionCount.java Wed Oct 19 12:15:05 2011
@@ -23,7 +23,7 @@ public class ActionCount<T> implements A
{
private long count = 0 ;
- //@Override
+ @Override
public void apply(T item)
{ count++ ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionPrint.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionPrint.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionPrint.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/ActionPrint.java Wed Oct 19 12:15:05 2011
@@ -30,6 +30,7 @@ public class ActionPrint <T extends Prin
public ActionPrint(IndentedWriter out, String sep) { this.out = out ; this.sep = sep ; }
public ActionPrint(IndentedWriter out) { this(out, " ") ; }
+ @Override
public void apply(Printable item)
{
if ( ! first && sep != null )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterOutNulls.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterOutNulls.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterOutNulls.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterOutNulls.java Wed Oct 19 12:15:05 2011
@@ -23,6 +23,7 @@ public class FilterOutNulls<T> implement
{
public FilterOutNulls() { }
+ @Override
public boolean accept(T item)
{
return item != null ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterStack.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterStack.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterStack.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterStack.java Wed Oct 19 12:15:05 2011
@@ -34,6 +34,7 @@ public abstract class FilterStack<T> imp
this.subFilterLast = callOldFilterFirst ;
}
+ @Override
public final boolean accept(T item)
{
if ( subFilterLast )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterUnique.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterUnique.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterUnique.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/FilterUnique.java Wed Oct 19 12:15:05 2011
@@ -27,6 +27,7 @@ public class FilterUnique<T> implements
public FilterUnique() { }
+ @Override
public boolean accept(T item)
{
if ( seen.contains(item) )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/Iter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/Iter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/Iter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/Iter.java Wed Oct 19 12:15:05 2011
@@ -46,9 +46,13 @@ public class Iter<T> implements Iterable
Accumulate<T,Set<T>> action = new Accumulate<T,Set<T>>()
{
private Set<T> acc = null ;
+ @Override
public void accumulate(T item) { acc.add(item) ; }
+ @Override
public Set<T> get() { return acc ; }
+ @Override
public void start() { acc = new HashSet<T>() ; }
+ @Override
public void finish() {}
} ;
return reduce(stream, action) ;
@@ -62,9 +66,13 @@ public class Iter<T> implements Iterable
Accumulate<T,List<T>> action = new Accumulate<T,List<T>>()
{
private List<T> acc = null ;
+ @Override
public void accumulate(T item) { acc.add(item) ; }
+ @Override
public List<T> get() { return acc ; }
+ @Override
public void start() { acc = new ArrayList<T>() ; }
+ @Override
public void finish() {}
} ;
return reduce(stream, action) ;
@@ -155,6 +163,7 @@ public class Iter<T> implements Iterable
boolean slotOccupied = false ;
T slot ;
+ @Override
public boolean hasNext()
{
if ( finished )
@@ -177,6 +186,7 @@ public class Iter<T> implements Iterable
return slotOccupied ;
}
+ @Override
public T next()
{
if ( hasNext() )
@@ -187,6 +197,7 @@ public class Iter<T> implements Iterable
throw new NoSuchElementException("filter.next") ;
}
+ @Override
public void remove() { throw new UnsupportedOperationException("filter.remove") ; }
} ;
@@ -200,6 +211,7 @@ public class Iter<T> implements Iterable
private Filter<T> baseFilter ;
private InvertedFilter(Filter<T> baseFilter) { this.baseFilter = baseFilter ; }
+ @Override
public boolean accept(T item)
{
return ! baseFilter.accept(item) ;
@@ -269,16 +281,19 @@ public class Iter<T> implements Iterable
public static <T, R> Iterator<R> map(final Iterator<? extends T> stream, final Transform<T, R> converter)
{
final Iterator<R> iter = new Iterator<R>(){
+ @Override
public boolean hasNext()
{
return stream.hasNext() ;
}
+ @Override
public R next()
{
return converter.convert(stream.next()) ;
}
+ @Override
public void remove() { throw new UnsupportedOperationException("map.remove") ; }
} ;
return iter ;
@@ -299,6 +314,7 @@ public class Iter<T> implements Iterable
private Iterator<? extends R> it = null; // Iterator for the current element of stream.
+ @Override
public boolean hasNext()
{
if ( it != null && it.hasNext() )
@@ -320,6 +336,7 @@ public class Iter<T> implements Iterable
return false ;
}
+ @Override
public R next()
{
if ( ! hasNext() )
@@ -328,6 +345,7 @@ public class Iter<T> implements Iterable
return it.next();
}
+ @Override
public void remove() { throw new UnsupportedOperationException("mapMany.remove") ; }
} ;
@@ -354,11 +372,13 @@ public class Iter<T> implements Iterable
final Action<T> action)
{
final Iterator<T> iter = new Iterator<T>(){
+ @Override
public boolean hasNext()
{
return stream.hasNext() ;
}
+ @Override
public T next()
{
T t = stream.next() ;
@@ -366,6 +386,7 @@ public class Iter<T> implements Iterable
return t ;
}
+ @Override
public void remove() { throw new UnsupportedOperationException("operate.remove") ; }
} ;
return iter ;
@@ -381,6 +402,7 @@ public class Iter<T> implements Iterable
public static <T> Iterator<T> printWrapper(final PrintStream out, final Iterator<? extends T> stream)
{
Action<T> action = new Action<T>(){
+ @Override
public void apply(T item)
{ out.println(item) ; }
} ;
@@ -478,7 +500,7 @@ public class Iter<T> implements Iterable
{
Transform<T,T> x = new Transform<T, T>()
{
- //@Override
+ @Override
public T convert(T item)
{
System.out.println(item) ;
@@ -729,6 +751,7 @@ public class Iter<T> implements Iterable
}
// ---- Iterable
+ @Override
public Iterator<T> iterator() { return iterator ; }
// ---- Iterator
@@ -739,10 +762,13 @@ public class Iter<T> implements Iterable
// the same memory allocation.
// And .. be an iterator framework for extension
+ @Override
public boolean hasNext() { return iterator.hasNext() ; }
+ @Override
public T next() { return iterator.next() ; }
+ @Override
public void remove() { iterator.remove() ; }
//----
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorArray.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorArray.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorArray.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorArray.java Wed Oct 19 12:15:05 2011
@@ -61,7 +61,7 @@ public final class IteratorArray<T> impl
finishIdx = array.length ;
}
- //@Override
+ @Override
public boolean hasNext()
{
// if ( idx < 0 )
@@ -78,7 +78,7 @@ public final class IteratorArray<T> impl
return array[idx] ;
}
- //@Override
+ @Override
public T next()
{
if ( ! hasNext() )
@@ -86,7 +86,7 @@ public final class IteratorArray<T> impl
return array[idx++] ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException("ArrayIterator") ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorBlockingQueue.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorBlockingQueue.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorBlockingQueue.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorBlockingQueue.java Wed Oct 19 12:15:05 2011
@@ -33,7 +33,7 @@ public class IteratorBlockingQueue<T> im
public IteratorBlockingQueue(BlockingQueue<T> queue, T endMarker) { this.queue = queue ; this.endMarker = endMarker ; }
- //@Override
+ @Override
public boolean hasNext()
{
if ( finished ) return false ;
@@ -57,7 +57,7 @@ public class IteratorBlockingQueue<T> im
return false ;
}
- //@Override
+ @Override
public T next()
{
if ( ! hasNext() )
@@ -67,7 +67,7 @@ public class IteratorBlockingQueue<T> im
return item ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorConcat.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorConcat.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorConcat.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorConcat.java Wed Oct 19 12:15:05 2011
@@ -47,7 +47,7 @@ public class IteratorConcat<T> implement
public void add(Iterator<T> iter) { iterators.add(iter) ; }
- //@Override
+ @Override
public boolean hasNext()
{
if ( finished )
@@ -69,14 +69,14 @@ public class IteratorConcat<T> implement
return false ;
}
- //@Override
+ @Override
public T next()
{
if ( ! hasNext() ) throw new NoSuchElementException() ;
return current.next();
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorCons.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorCons.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorCons.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorCons.java Wed Oct 19 12:15:05 2011
@@ -58,7 +58,7 @@ public class IteratorCons<T> implements
this.iter2 = iter2 ;
}
- //@Override
+ @Override
public boolean hasNext()
{
if ( iter1 != null )
@@ -77,7 +77,7 @@ public class IteratorCons<T> implements
return false ;
}
- //@Override
+ @Override
public T next()
{
if ( ! hasNext() )
@@ -89,7 +89,7 @@ public class IteratorCons<T> implements
throw new Error("Iterator2.next") ;
}
- //@Override
+ @Override
public void remove()
{
if ( iter1 != null )
@@ -105,7 +105,7 @@ public class IteratorCons<T> implements
throw new NoSuchElementException("Iterator2.remove") ;
}
- //@Override
+ @Override
public Iterator<T> iterator()
{
return this ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorDelayedInitialization.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorDelayedInitialization.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorDelayedInitialization.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorDelayedInitialization.java Wed Oct 19 12:15:05 2011
@@ -41,18 +41,21 @@ public abstract class IteratorDelayedIni
// Called exactly once
protected abstract Iterator<T> initializeIterator() ;
+ @Override
public boolean hasNext()
{
init() ;
return iterator.hasNext() ;
}
+ @Override
public T next()
{
init() ;
return iterator.next() ;
}
+ @Override
public void remove()
{
init() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorInteger.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorInteger.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorInteger.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorInteger.java Wed Oct 19 12:15:05 2011
@@ -40,11 +40,13 @@ public class IteratorInteger implements
this.current = start ;
}
+ @Override
public boolean hasNext()
{
return ( current < finish ) ;
}
+ @Override
public Long next()
{
Long v = Long.valueOf(current) ;
@@ -52,6 +54,7 @@ public class IteratorInteger implements
return v ;
}
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorResourceClosing.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorResourceClosing.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorResourceClosing.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorResourceClosing.java Wed Oct 19 12:15:05 2011
@@ -47,7 +47,7 @@ public class IteratorResourceClosing<T>
if (finished) throw new AtlasException("IteratorResourceClosing is closed, no further operations can be performed on it.") ;
}
- //@Override
+ @Override
public boolean hasNext()
{
if (finished)
@@ -63,21 +63,21 @@ public class IteratorResourceClosing<T>
return toReturn ;
}
- //@Override
+ @Override
public T next()
{
checkFinished();
return iter.next() ;
}
- //@Override
+ @Override
public void remove()
{
checkFinished();
iter.remove() ;
}
- //@Override
+ @Override
public void close()
{
if (!finished)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorSlotted.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorSlotted.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorSlotted.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorSlotted.java Wed Oct 19 12:15:05 2011
@@ -49,7 +49,7 @@ public abstract class IteratorSlotted<T>
protected boolean isFinished() { return finished ; }
- //@Override
+ @Override
public final boolean hasNext()
{
if ( finished )
@@ -70,7 +70,7 @@ public abstract class IteratorSlotted<T>
}
/** final - autoclose and registration relies on it - implement moveToNextBinding() */
- //@Override
+ @Override
public final T next()
{
if ( ! hasNext() ) throw new NoSuchElementException(Utils.className(this)) ;
@@ -95,7 +95,7 @@ public abstract class IteratorSlotted<T>
return slot ;
}
- //@Override
+ @Override
public final void remove()
{
throw new UnsupportedOperationException(Utils.className(this)+".remove") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorTruncate.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorTruncate.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorTruncate.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorTruncate.java Wed Oct 19 12:15:05 2011
@@ -35,6 +35,7 @@ public class IteratorTruncate<T> impleme
public IteratorTruncate (Test test, Iterator<T> iter)
{ this.test = test ; this.iter = iter ; }
+ @Override
public boolean hasNext()
{
if ( ! active ) return false ;
@@ -58,6 +59,7 @@ public class IteratorTruncate<T> impleme
return false ;
}
+ @Override
public T next()
{
if ( ! hasNext() )
@@ -67,6 +69,7 @@ public class IteratorTruncate<T> impleme
return x ;
}
+ @Override
public void remove()
{ throw new UnsupportedOperationException("IteratorTruncate.remove"); }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithBuffer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithBuffer.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithBuffer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithBuffer.java Wed Oct 19 12:15:05 2011
@@ -59,13 +59,13 @@ public class IteratorWithBuffer<T> imple
}
}
- //@Override
+ @Override
public boolean hasNext()
{
return lookahead.size() > 0 ;
}
- //@Override
+ @Override
public T next()
{
if ( !hasNext() )
@@ -86,7 +86,7 @@ public class IteratorWithBuffer<T> imple
return item ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException("remove") ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithHistory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithHistory.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithHistory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/IteratorWithHistory.java Wed Oct 19 12:15:05 2011
@@ -43,7 +43,7 @@ public class IteratorWithHistory<T> impl
this.capacity = N ;
}
- //@Override
+ @Override
public boolean hasNext()
{
boolean b = iter.hasNext() ;
@@ -52,7 +52,7 @@ public class IteratorWithHistory<T> impl
return b ;
}
- //@Override
+ @Override
public T next()
{
T item = null ;
@@ -65,7 +65,7 @@ public class IteratorWithHistory<T> impl
return item ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException("remove") ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/NullIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/NullIterator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/NullIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/NullIterator.java Wed Oct 19 12:15:05 2011
@@ -24,19 +24,23 @@ import java.util.NoSuchElementException
/** Null Iterator - also guaranteed sharable and immutable */
public class NullIterator<T> implements Iterator<T>, Iterable<T>
{
+ @Override
public boolean hasNext()
{
return false ;
}
+ @Override
public T next()
{
throw new NoSuchElementException("NullIterator.next") ;
}
+ @Override
public void remove()
{ throw new NoSuchElementException("NullIterator.remove") ;}
+ @Override
public Iterator<T> iterator()
{
return this ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PeekIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PeekIterator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PeekIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PeekIterator.java Wed Oct 19 12:15:05 2011
@@ -55,7 +55,7 @@ public class PeekIterator<T> implements
}
}
- //@Override
+ @Override
public boolean hasNext()
{
if ( finished )
@@ -79,7 +79,7 @@ public class PeekIterator<T> implements
return slot ;
}
- //@Override
+ @Override
public T next()
{
if ( finished )
@@ -90,7 +90,7 @@ public class PeekIterator<T> implements
return x ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java Wed Oct 19 12:15:05 2011
@@ -38,12 +38,14 @@ public class PushbackIterator<T> impleme
items.push(item) ;
}
+ @Override
public boolean hasNext()
{
if ( !items.empty() ) return true ;
return iter.hasNext() ;
}
+ @Override
public T next()
{
if ( !items.empty() )
@@ -51,6 +53,7 @@ public class PushbackIterator<T> impleme
return iter.next() ;
}
+ @Override
public void remove()
{
// Need to track if last next() was from the stack or not.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/RepeatApplyIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/RepeatApplyIterator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/RepeatApplyIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/RepeatApplyIterator.java Wed Oct 19 12:15:05 2011
@@ -36,7 +36,7 @@ public abstract class RepeatApplyIterato
this.input = input ;
}
- //@Override
+ @Override
public boolean hasNext()
{
if ( finished )
@@ -64,7 +64,7 @@ public abstract class RepeatApplyIterato
protected abstract Iterator<T> makeNextStage(T t) ;
- //@Override
+ @Override
public T next()
{
if ( ! hasNext() )
@@ -72,11 +72,11 @@ public abstract class RepeatApplyIterato
return currentStage.next() ;
}
- //@Override
+ @Override
public final void remove()
{ throw new UnsupportedOperationException() ; }
- //@Override
+ @Override
public void close()
{
Iter.close(input) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/SingletonIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/SingletonIterator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/SingletonIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/SingletonIterator.java Wed Oct 19 12:15:05 2011
@@ -30,11 +30,13 @@ public class SingletonIterator<T> implem
public SingletonIterator(T thing) { this.thing = thing ; }
+ @Override
public boolean hasNext()
{
return ! yielded ;
}
+ @Override
public T next()
{
if ( yielded )
@@ -43,9 +45,11 @@ public class SingletonIterator<T> implem
return thing ;
}
+ @Override
public void remove()
{ throw new NoSuchElementException("SingletonIterator.remove") ;}
+ @Override
public Iterator<T> iterator()
{
return this ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/WrapperIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/WrapperIterator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/WrapperIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/WrapperIterator.java Wed Oct 19 12:15:05 2011
@@ -26,19 +26,19 @@ public class WrapperIterator<T> implemen
public WrapperIterator(Iterator<T> iter) { this.iter = iter ; }
- //@Override
+ @Override
public boolean hasNext()
{
return iter.hasNext() ;
}
- //@Override
+ @Override
public T next()
{
return iter.next() ;
}
- //@Override
+ @Override
public void remove()
{ iter.remove() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonArray.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonArray.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonArray.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonArray.java Wed Oct 19 12:15:05 2011
@@ -51,153 +51,150 @@ public class JsonArray extends JsonValue
public void visit(JsonVisitor visitor)
{ visitor.visit(this) ; }
- //@Override
+ @Override
public boolean add(JsonValue e)
{
return array.add(e) ;
}
- //@Override
public boolean add(String e)
{
return array.add(new JsonString(e)) ;
}
- //@Override
public boolean add(long val)
{
return array.add(JsonNumber.value(val)) ;
}
- //@Override
public boolean add(boolean b)
{
return array.add(new JsonBoolean(b)) ;
}
- //@Override
+ @Override
public void add(int index, JsonValue element)
{ array.add(index, element) ; }
- //@Override
+ @Override
public boolean addAll(Collection< ? extends JsonValue> c)
{
return array.addAll(c) ;
}
- //@Override
+ @Override
public boolean addAll(int index, Collection< ? extends JsonValue> c)
{
return array.addAll(index, c) ;
}
- //@Override
+ @Override
public void clear()
{ array.clear() ; }
- //@Override
+ @Override
public boolean contains(Object object)
{
return array.contains(object) ;
}
- //@Override
+ @Override
public boolean containsAll(Collection< ? > c)
{
return array.containsAll(c) ;
}
- //@Override
+ @Override
public JsonValue get(int index)
{
return array.get(index) ;
}
- //@Override
+ @Override
public int indexOf(Object o)
{
return array.indexOf(o) ;
}
- //@Override
+ @Override
public boolean isEmpty()
{
return array.isEmpty() ;
}
- //@Override
+ @Override
public Iterator<JsonValue> iterator()
{
return array.iterator() ;
}
- //@Override
+ @Override
public int lastIndexOf(Object o)
{
return array.lastIndexOf(o) ;
}
- //@Override
+ @Override
public ListIterator<JsonValue> listIterator()
{
return array.listIterator() ;
}
- //@Override
+ @Override
public ListIterator<JsonValue> listIterator(int index)
{
return array.listIterator(index) ;
}
- //@Override
+ @Override
public boolean remove(Object o)
{
return array.remove(o) ;
}
- //@Override
+ @Override
public JsonValue remove(int index)
{
return array.remove(index) ;
}
- //@Override
+ @Override
public boolean removeAll(Collection< ? > c)
{
return array.removeAll(c) ;
}
- //@Override
+ @Override
public boolean retainAll(Collection< ? > c)
{
return array.retainAll(c) ;
}
- //@Override
+ @Override
public JsonValue set(int index, JsonValue element)
{
return array.set(index, element) ;
}
- //@Override
+ @Override
public int size()
{
return array.size() ;
}
- //@Override
+ @Override
public List<JsonValue> subList(int fromIndex, int toIndex)
{
return array.subList(fromIndex, toIndex) ;
}
- //@Override
+ @Override
public Object[] toArray()
{
return array.toArray() ;
}
- //@Override
+ @Override
public <T> T[] toArray(T[] a)
{
return array.toArray(a) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonObject.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonObject.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonObject.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonObject.java Wed Oct 19 12:15:05 2011
@@ -50,93 +50,82 @@ public class JsonObject extends JsonValu
return map.equals(((JsonObject)other).map) ;
}
- //@Override
public void clear()
{ map.clear() ; }
- //@Override
public boolean hasKey(Object key)
{
return map.containsKey(key) ;
}
-// //@Override
+// @Override
// public boolean containsValue(Object value)
// {
// return map.containsValue(value) ;
// }
- //@Override
public Set<String> keys()
{
return map.keySet() ;
}
- //@Override
public Set<Entry<String, JsonValue>> entrySet()
{
return map.entrySet() ;
}
- //@Override
public JsonValue get(String key)
{
return map.get(key) ;
}
- //@Override
+
public boolean isEmpty()
{
return map.isEmpty() ;
}
- //@Override
+
public Set<String> keySet()
{
return map.keySet() ;
}
- //@Override
+
public JsonValue put(String key, JsonValue value)
{
return map.put(key, value) ;
}
- //@Override
+
public JsonValue put(String key, String value)
{
return map.put(key, new JsonString(value)) ;
}
- //@Override
public JsonValue put(String key, long value)
{
return map.put(key, JsonNumber.value(value)) ;
}
- //@Override
public JsonValue put(String key, boolean b)
{
return map.put(key, new JsonBoolean(b)) ;
}
-
-
- //@Override
public void putAll(Map< ? extends String, ? extends JsonValue> m)
{
map.putAll(m) ;
}
- //@Override
public JsonValue remove(Object key)
{
return map.remove(key) ;
}
- //@Override
+
public int size()
{
return map.size() ;
}
- //@Override
+
public Collection<JsonValue> values()
{
return map.values() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonValue.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonValue.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonValue.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/JsonValue.java Wed Oct 19 12:15:05 2011
@@ -59,7 +59,7 @@ public abstract class JsonValue implemen
return buff.asString() ;
}
- //@Override
+ @Override
public void output(IndentedWriter out)
{
JsonWriter w = new JsonWriter(out) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONHandlerBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONHandlerBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONHandlerBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONHandlerBase.java Wed Oct 19 12:15:05 2011
@@ -21,67 +21,67 @@ package org.openjena.atlas.json.io;
public class JSONHandlerBase implements JSONHandler
{
- //@Override
+ @Override
public void startParse(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishParse(long currLine, long currCol)
{}
- //@Override
+ @Override
public void startObject(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishObject(long currLine, long currCol)
{}
- //@Override
+ @Override
public void startPair(long currLine, long currCol)
{}
- //@Override
+ @Override
public void keyPair(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishPair(long currLine, long currCol)
{}
- //@Override
+ @Override
public void startArray(long currLine, long currCol)
{}
- //@Override
+ @Override
public void element(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishArray(long currLine, long currCol)
{}
- //@Override
+ @Override
public void valueString(String image, long currLine, long currCol)
{}
- //@Override
+ @Override
public void valueInteger(String image, long currLine, long currCol)
{}
- //@Override
+ @Override
public void valueDecimal(String image, long currLine, long currCol)
{}
- //@Override
+ @Override
public void valueDouble(String image, long currLine, long currCol)
{}
- //@Override
+ @Override
public void valueBoolean(boolean b, long currLine, long currCol)
{}
- //@Override
+ @Override
public void valueNull(long currLine, long currCol)
{}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java Wed Oct 19 12:15:05 2011
@@ -50,58 +50,58 @@ public class JSONMaker implements JSONHa
return value ;
}
- //@Override
+ @Override
public void startParse(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishParse(long currLine, long currCol)
{}
- //@Override
+ @Override
public void startObject(long currLine, long currCol)
{
objects.push(new JsonObject()) ;
}
- //@Override
+ @Override
public void finishObject(long currLine, long currCol)
{
value = objects.pop() ;
}
- //@Override
+ @Override
public void startArray(long currLine, long currCol)
{
arrays.push(new JsonArray()) ;
}
- //@Override
+ @Override
public void element(long currLine, long currCol)
{
arrays.peek().add(value) ;
value = null ;
}
- //@Override
+ @Override
public void finishArray(long currLine, long currCol)
{
value = arrays.pop() ;
}
- //@Override
+ @Override
public void startPair(long currLine, long currCol)
{
}
- //@Override
+ @Override
public void keyPair(long currLine, long currCol)
{
keys.push(value.getAsString().value()) ;
}
- //@Override
+ @Override
public void finishPair(long currLine, long currCol)
{
if ( value == null )
@@ -115,37 +115,37 @@ public class JSONMaker implements JSONHa
value = null ;
}
- //@Override
+ @Override
public void valueBoolean(boolean b, long currLine, long currCol)
{
value = new JsonBoolean(b) ;
}
- //@Override
+ @Override
public void valueDecimal(String image, long currLine, long currCol)
{
value = JsonNumber.valueDecimal(image) ;
}
- //@Override
+ @Override
public void valueDouble(String image, long currLine, long currCol)
{
value = JsonNumber.valueDouble(image) ;
}
- //@Override
+ @Override
public void valueInteger(String image, long currLine, long currCol)
{
value = JsonNumber.valueInteger(image) ;
}
- //@Override
+ @Override
public void valueNull(long currLine, long currCol)
{
value = JsonNull.instance ;
}
- //@Override
+ @Override
public void valueString(String image, long currLine, long currCol)
{
value = new JsonString(image) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JsonWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JsonWriter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JsonWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JsonWriter.java Wed Oct 19 12:15:05 2011
@@ -60,7 +60,7 @@ public class JsonWriter implements JsonV
// Make "unnecessary" space
private static String SPC = " " ;
- //@Override
+ @Override
public void visit(JsonObject jsonObject)
{
out.print(ObjectStart) ;
@@ -96,7 +96,7 @@ public class JsonWriter implements JsonV
}
- //@Override
+ @Override
public void visit(JsonArray jsonArray)
{
boolean multiLine = (jsonArray.size() > 1 ) ;
@@ -126,26 +126,26 @@ public class JsonWriter implements JsonV
out.print(ArrayFinish) ;
}
- //@Override
+ @Override
public void visit(JsonString jsonString)
{
JSWriter.outputQuotedString(out, jsonString.value()) ;
}
- //@Override
+ @Override
public void visit(JsonNumber jsonNumber)
{
out.print(jsonNumber.value().toString()) ;
}
- //@Override
+ @Override
public void visit(JsonBoolean jsonBoolean)
{
String x = jsonBoolean.value() ? "true" : "false" ;
out.print(x) ;
}
- //@Override
+ @Override
public void visit(JsonNull jsonNull)
{ out.print("null") ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parser/TokenizerJSON.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parser/TokenizerJSON.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parser/TokenizerJSON.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parser/TokenizerJSON.java Wed Oct 19 12:15:05 2011
@@ -50,6 +50,7 @@ public class TokenizerJSON implements To
this.reader = reader ;
}
+ @Override
public final boolean hasNext()
{
if ( finished )
@@ -63,12 +64,14 @@ public class TokenizerJSON implements To
return token != null ;
}
+ @Override
public final boolean eof()
{
return hasNext() ;
}
/** Move to next token */
+ @Override
public final Token next()
{
if ( ! hasNext() )
@@ -79,13 +82,14 @@ public class TokenizerJSON implements To
}
+ @Override
public final Token peek()
{
if ( ! hasNext() ) return null ;
return token ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
@@ -629,11 +633,13 @@ public class TokenizerJSON implements To
}
}
+ @Override
public long getColumn()
{
return reader.getColNum() ;
}
+ @Override
public long getLine()
{
return reader.getLineNum() ;
@@ -641,7 +647,7 @@ public class TokenizerJSON implements To
// ---- Character classes
- //@Override
+ @Override
public void close()
{
try { reader.close() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parserjavacc/JSONPrinter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parserjavacc/JSONPrinter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parserjavacc/JSONPrinter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/parserjavacc/JSONPrinter.java Wed Oct 19 12:15:05 2011
@@ -27,27 +27,27 @@ public class JSONPrinter implements JSON
IndentedWriter out ;
- //@Override
+ @Override
public void startParse(long currLine, long currCol)
{
out = new IndentedWriter(System.out, true) ;
//out.setPadString("> ") ;
}
- //@Override
+ @Override
public void finishParse(long currLine, long currCol)
{
out.flush() ;
}
- //@Override
+ @Override
public void startObject(long currLine, long currCol)
{
out.println(">>Object") ;
out.incIndent() ;
}
- //@Override
+ @Override
public void finishObject(long currLine, long currCol)
{
out.decIndent() ;
@@ -55,73 +55,73 @@ public class JSONPrinter implements JSON
}
- //@Override
+ @Override
public void startPair(long currLine, long currCol)
{
out.println(">Pair") ;
out.incIndent() ;
}
- //@Override
+ @Override
public void keyPair(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishPair(long currLine, long currCol)
{
out.decIndent() ;
out.println("<Pair") ;
}
- //@Override
+ @Override
public void startArray(long currLine, long currCol)
{
out.println(">>Array") ;
out.incIndent() ;
}
- //@Override
+ @Override
public void element(long currLine, long currCol)
{}
- //@Override
+ @Override
public void finishArray(long currLine, long currCol)
{
out.decIndent() ;
out.println("<<Array") ;
}
- //@Override
+ @Override
public void valueBoolean(boolean b, long currLine, long currCol)
{
out.println("Boolean: "+b) ;
}
- //@Override
+ @Override
public void valueDecimal(String image, long currLine, long currCol)
{
out.println("Decimal: "+image) ;
}
- //@Override
+ @Override
public void valueDouble(String image, long currLine, long currCol)
{
out.println("Double: "+image) ;
}
- //@Override
+ @Override
public void valueInteger(String image, long currLine, long currCol)
{
out.println("Integer: "+image) ;
}
- //@Override
+ @Override
public void valueNull(long currLine, long currCol)
{
out.println("Null") ;
}
- //@Override
+ @Override
public void valueString(String image, long currLine, long currCol)
{
out.println("String: "+image) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ListUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ListUtils.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ListUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ListUtils.java Wed Oct 19 12:15:05 2011
@@ -101,6 +101,7 @@ public class ListUtils
{
Action<T> output = new Action<T>() {
boolean first = true ;
+ @Override
public void apply(T item)
{
if ( ! first ) out.print(sep) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Map2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Map2.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Map2.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Map2.java Wed Oct 19 12:15:05 2011
@@ -75,6 +75,7 @@ public class Map2<K, V> implements Itera
}
// The keys.
+ @Override
public Iterator<K> iterator()
{
Iter<K> iter1 = Iter.iter(map1.keySet().iterator()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/MultiSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/MultiSet.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/MultiSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/MultiSet.java Wed Oct 19 12:15:05 2011
@@ -128,7 +128,6 @@ public class MultiSet<T> implements Iter
return multiSetSize ;
}
- //@Override
private Iterator<T> iterator1()
{
// CRUDE
@@ -142,7 +141,7 @@ public class MultiSet<T> implements Iter
return expanded.iterator() ;
}
- //@Override
+ @Override
public Iterator<T> iterator()
{
return new Iterator<T>() {
@@ -152,7 +151,7 @@ public class MultiSet<T> implements Iter
long keyCount = 0 ;
T slot = null ;
- //@Override
+ @Override
public boolean hasNext()
{
if ( slot != null )
@@ -184,7 +183,7 @@ public class MultiSet<T> implements Iter
return false ;
}
- //@Override
+ @Override
public T next()
{
if ( ! hasNext() ) throw new NoSuchElementException() ;
@@ -193,7 +192,7 @@ public class MultiSet<T> implements Iter
return x ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
} ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolBase.java Wed Oct 19 12:15:05 2011
@@ -36,6 +36,7 @@ public class PoolBase<T> implements Pool
public PoolBase() {}
//public Pool(int maxSize) { this.maxSize = maxSize ; }
+ @Override
public void put(T item)
{
// Currently, unbounded
@@ -45,11 +46,13 @@ public class PoolBase<T> implements Pool
}
/** Get an item from the pool - return null if the pool is empty */
+ @Override
public T get()
{
if ( pool.size() == 0 ) return null ;
return pool.pop();
}
+ @Override
public boolean isEmpty() { return pool.size() == 0 ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java Wed Oct 19 12:15:05 2011
@@ -22,16 +22,19 @@ public class PoolFiniteBlocking<T> imple
{
private PoolFiniteBlocking(int size) { throw new NotImplemented() ; }
+ @Override
public T get()
{
return null ;
}
+ @Override
public boolean isEmpty()
{
return false ;
}
+ @Override
public void put(T item)
{}
}
@@ -48,13 +51,13 @@ public class PoolFiniteBlocking<T> imple
//
// public PoolFiniteBlocking(int size) { pool = new LinkedBlockingDeque<T>(size) ; }
//
-// //@Override
+// @Override
// public final void put(T item)
// {
// pool.addLast(item) ;
// }
//
-// //@Override
+// @Override
// public T get()
// {
// try
@@ -66,6 +69,6 @@ public class PoolFiniteBlocking<T> imple
// }
// }
//
-// //@Override
+// @Override
// public boolean isEmpty() { return pool.isEmpty() ; }
//}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolSync.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolSync.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolSync.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolSync.java Wed Oct 19 12:15:05 2011
@@ -36,18 +36,18 @@ public class PoolSync<T> implements Pool
public PoolSync(Pool<T> pool) { this.pool = pool ; }
- //@Override
+ @Override
public final synchronized void put(T item)
{
pool.put(item) ;
}
- //@Override
+ @Override
public final synchronized T get()
{
return pool.get();
}
- //@Override
+ @Override
public final synchronized boolean isEmpty() { return pool.isEmpty() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertiesSorted.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertiesSorted.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertiesSorted.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertiesSorted.java Wed Oct 19 12:15:05 2011
@@ -72,11 +72,13 @@ public class PropertiesSorted extends Pr
this.iterator = iterator ;
}
+ @Override
public boolean hasMoreElements()
{
return iterator.hasNext() ;
}
+ @Override
public T nextElement()
{
return iterator.next();
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ReverseComparator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ReverseComparator.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ReverseComparator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ReverseComparator.java Wed Oct 19 12:15:05 2011
@@ -30,6 +30,7 @@ public class ReverseComparator<T> implem
this.comparator = comparator ;
}
+ @Override
public int compare(T o1, T o2)
{
return comparator.compare(o2, o1) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkLogging.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkLogging.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkLogging.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkLogging.java Wed Oct 19 12:15:05 2011
@@ -26,16 +26,16 @@ public class SinkLogging<T> implements S
public SinkLogging(Logger log) { this.log = log ; }
- //@Override
+ @Override
public void send(T item)
{
log.info("Sink: "+item) ;
}
- //@Override
+ @Override
public void flush() { }
- //@Override
+ @Override
public void close() {}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkNull.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkNull.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkNull.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkNull.java Wed Oct 19 12:15:05 2011
@@ -24,7 +24,10 @@ public class SinkNull<T> implements Sink
{
public static <X> SinkNull<X> create() { return new SinkNull<X>() ; }
- /*@Override*/ public void send(T thing) {}
- /*@Override*/ public void close() {}
- /*@Override*/ public void flush() { }
+ /*@Override*/ @Override
+ public void send(T thing) {}
+ /*@Override*/ @Override
+ public void close() {}
+ /*@Override*/ @Override
+ public void flush() { }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkPrint.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkPrint.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkPrint.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkPrint.java Wed Oct 19 12:15:05 2011
@@ -31,15 +31,15 @@ public class SinkPrint<T> implements Sin
public SinkPrint(PrintStream out)
{ this.out = out ; }
- //@Override
+ @Override
public void send(T item)
{
out.println("Sink: "+item) ;
}
- //@Override
+ @Override
public void flush() { }
- //@Override
+ @Override
public void close() {}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkSplit.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkSplit.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkSplit.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkSplit.java Wed Oct 19 12:15:05 2011
@@ -32,18 +32,21 @@ public class SinkSplit<T> implements Sin
this.sink2 = sink2 ;
}
+ @Override
public void flush()
{
sink1.flush();
sink2.flush();
}
+ @Override
public void send(T item)
{
sink1.send(item) ;
sink2.send(item) ;
}
+ @Override
public void close()
{
sink1.close();
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/SinkWrapper.java Wed Oct 19 12:15:05 2011
@@ -30,12 +30,15 @@ public class SinkWrapper<T> implements S
this.sink = sink ;
}
+ @Override
public void flush()
{ sink.flush(); }
+ @Override
public void send(T item)
{ sink.send(item) ; }
+ @Override
public void close()
{ sink.close(); }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Tuple.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Tuple.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Tuple.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Tuple.java Wed Oct 19 12:15:05 2011
@@ -50,7 +50,7 @@ public final class Tuple<T> implements I
public static <T> Iterator<T> project(final int slot, Iterator<Tuple<T>> iter)
{
Transform<Tuple<T>, T> projection = new Transform<Tuple<T>, T>(){
- //@Override
+ @Override
public T convert(Tuple<T> tuple)
{
return tuple.get(slot) ;
@@ -62,7 +62,7 @@ public final class Tuple<T> implements I
public static <T> Iterator<Tuple<T>> prefix(final int prefixLength, Iterator<Tuple<T>> iter)
{
Transform<Tuple<T>, Tuple<T>> sub = new Transform<Tuple<T>, Tuple<T>>(){
- //@Override
+ @Override
public Tuple<T> convert(Tuple<T> tuple)
{
T[] x = ArrayUtils.copy(tuple.tuple,0, prefixLength) ;
@@ -100,7 +100,7 @@ public final class Tuple<T> implements I
return ArrayUtils.copy(tuple) ;
}
- //@Override
+ @Override
public Iterator<T> iterator()
{
return IteratorArray.create(tuple) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache0.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache0.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache0.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache0.java Wed Oct 19 12:15:05 2011
@@ -27,44 +27,53 @@ import org.openjena.atlas.lib.Cache ;
/** A cache that keeps nothing */
public final class Cache0<K, V> implements Cache<K,V>
{
+ @Override
public boolean containsKey(K key)
{
return false ;
}
+ @Override
public V get(K key)
{
return null ;
}
+ @Override
public V put(K key, V thing)
{
return null ;
}
+ @Override
public boolean remove(K key)
{
return false ;
}
+ @Override
public Iterator<K> keys()
{
return Iter.nullIterator() ;
}
+ @Override
public boolean isEmpty()
{
return true ;
}
+ @Override
public void clear()
{}
+ @Override
public long size()
{
return 0 ;
}
+ @Override
public void setDropHandler(ActionKeyValue<K, V> dropHandler)
{}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache1.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache1.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache1.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/Cache1.java Wed Oct 19 12:15:05 2011
@@ -37,7 +37,7 @@ public class Cache1<K, V> implements Cac
public Cache1() { clear() ; }
- //@Override
+ @Override
public boolean containsKey(K key)
{
if ( cacheKey == null )
@@ -45,7 +45,7 @@ public class Cache1<K, V> implements Cac
return cacheKey.equals(key) ;
}
- //@Override
+ @Override
public V get(K key)
{
if ( cacheKey == null ) return null ;
@@ -53,7 +53,7 @@ public class Cache1<K, V> implements Cac
return null ;
}
- //@Override
+ @Override
public void clear()
{
if ( cacheKey == null )
@@ -67,19 +67,19 @@ public class Cache1<K, V> implements Cac
notifyDrop(k, v) ;
}
- //@Override
+ @Override
public boolean isEmpty()
{
return cacheKey == null ;
}
- //@Override
+ @Override
public Iterator<K> keys()
{
return new SingletonIterator<K>(cacheKey) ;
}
- //@Override
+ @Override
public V put(K key, V thing)
{
if ( Lib.equal(cacheKey, key) && Lib.equal(cacheValue, thing) )
@@ -96,7 +96,7 @@ public class Cache1<K, V> implements Cac
return v ;
}
- //@Override
+ @Override
public boolean remove(K key)
{
if ( cacheKey == null ) return false ;
@@ -109,7 +109,7 @@ public class Cache1<K, V> implements Cac
return false ;
}
- //@Override
+ @Override
public void setDropHandler(ActionKeyValue<K, V> dropHandler)
{
this.dropHandler = dropHandler ;
@@ -121,7 +121,7 @@ public class Cache1<K, V> implements Cac
dropHandler.apply(key, thing) ;
}
- //@Override
+ @Override
public long size()
{
return (cacheKey == null) ? 0 : 1 ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheLRU.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheLRU.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheLRU.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheLRU.java Wed Oct 19 12:15:05 2011
@@ -37,55 +37,56 @@ public class CacheLRU<K,V> implements Ca
this.cache = new CacheImpl<K, V>(loadFactor, maxSize) ;
}
- //@Override
+ @Override
public void clear()
{ cache.clear() ; }
- //@Override
+ @Override
public boolean containsKey(K key)
{
return cache.containsKey(key) ;
}
- //@Override
+ @Override
public V get(K key)
{
return cache.get(key) ;
}
- //@Override
+ @Override
public V put(K key, V thing)
{
return cache.put(key, thing) ;
}
- //@Override
+ @Override
public boolean remove(K key)
{
V old = cache.remove(key) ;
return old != null ;
}
- //@Override
+ @Override
public long size()
{
return cache.size() ;
}
- //@Override
+ @Override
// NB Access the iterator must be thread-aware.
public Iterator<K> keys()
{
return cache.keySet().iterator() ;
}
- //@Override
+ @Override
public boolean isEmpty()
{
return cache.isEmpty() ;
}
/** Callback for entries when dropped from the cache */
+ @Override
public void setDropHandler(ActionKeyValue<K,V> dropHandler)
{
cache.setDropHandler(dropHandler) ;