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 [8/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/lib/cache/CacheSetLRU.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetLRU.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetLRU.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetLRU.java Wed Oct 19 12:15:05 2011
@@ -53,13 +53,13 @@ public class CacheSetLRU<T> implements C
public Wrapper(Action<T> dropHandler)
{ this.dropHandler = dropHandler ; }
- //@Override
+ @Override
public void apply(T key, Object value)
{ dropHandler.apply(key) ; }
}
- //@Override
+ @Override
synchronized
public void add(T e)
{
@@ -67,6 +67,7 @@ public class CacheSetLRU<T> implements C
}
+ @Override
synchronized
public void clear()
{
@@ -74,6 +75,7 @@ public class CacheSetLRU<T> implements C
}
+ @Override
synchronized
public boolean contains(T obj)
{
@@ -81,6 +83,7 @@ public class CacheSetLRU<T> implements C
}
+ @Override
synchronized
public boolean isEmpty()
{
@@ -94,6 +97,7 @@ public class CacheSetLRU<T> implements C
// }
+ @Override
synchronized
public void remove(T obj)
{
@@ -101,6 +105,7 @@ public class CacheSetLRU<T> implements C
}
+ @Override
synchronized
public long size()
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetSync.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetSync.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetSync.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetSync.java Wed Oct 19 12:15:05 2011
@@ -27,23 +27,29 @@ public class CacheSetSync<T> implements
public CacheSetSync(CacheSet<T> cache){ this.cache = cache ; }
//@Overview
+ @Override
synchronized public void add(T e) { cache.add(e) ; }
//@Overview
+ @Override
synchronized public void clear() { cache.clear() ; }
//@Overview
+ @Override
synchronized public boolean contains(T obj) { return cache.contains(obj) ; }
//@Overview
+ @Override
synchronized
public boolean isEmpty() { return cache.isEmpty() ; }
//@Overview
+ @Override
synchronized
public void remove(T obj) { cache.remove(obj) ; }
//@Overview
+ @Override
synchronized
public long size() { return cache.size() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSetWrapper.java Wed Oct 19 12:15:05 2011
@@ -26,25 +26,31 @@ public class CacheSetWrapper<T> implemen
public CacheSetWrapper(CacheSet<T> cache){ this.cache = cache ; }
+ @Override
public void add(T e)
{ cache.add(e) ; }
+ @Override
public void clear()
{ cache.clear() ; }
+ @Override
public boolean contains(T obj)
{
return cache.contains(obj) ;
}
+ @Override
public boolean isEmpty()
{
return cache.isEmpty() ;
}
+ @Override
public void remove(T obj)
{ cache.remove(obj) ; }
+ @Override
public long size()
{
return cache.size() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSimple.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSimple.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSimple.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSimple.java Wed Oct 19 12:15:05 2011
@@ -55,7 +55,7 @@ public class CacheSimple<K,V> implements
}
- //@Override
+ @Override
public void clear()
{
Arrays.fill(values, null) ;
@@ -64,7 +64,7 @@ public class CacheSimple<K,V> implements
currentSize = 0 ;
}
- //@Override
+ @Override
public boolean containsKey(K key)
{
return get(key) != null ;
@@ -87,7 +87,7 @@ public class CacheSimple<K,V> implements
return -x-1 ;
}
- //@Override
+ @Override
//public V getObject(K key, boolean exclusive)
public V get(K key)
{
@@ -97,7 +97,7 @@ public class CacheSimple<K,V> implements
return values[x] ;
}
- //@Override
+ @Override
public V put(K key, V thing)
{
int x = index(key) ;
@@ -123,33 +123,34 @@ public class CacheSimple<K,V> implements
return old ;
}
- //@Override
+ @Override
public boolean remove(K key)
{
V old = put(key, null) ;
return old != null ;
}
- //@Override
+ @Override
public long size()
{
return currentSize ;
}
- //@Override
+ @Override
public Iterator<K> keys()
{
Iterator<K> iter = IteratorArray.create(keys) ;
return Iter.removeNulls(iter) ;
}
- //@Override
+ @Override
public boolean isEmpty()
{
return currentSize == 0 ;
}
/** Callback for entries when dropped from the cache */
+ @Override
public void setDropHandler(ActionKeyValue<K,V> dropHandler)
{
this.dropHandler = dropHandler ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsAtomic.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsAtomic.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsAtomic.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsAtomic.java Wed Oct 19 12:15:05 2011
@@ -49,7 +49,7 @@ public class CacheStatsAtomic<Key,Value>
// Wrap any real drop handler.
EjectMonitor(ActionKeyValue<Key,Value> other) { this.other = other ; }
- //@Override
+ @Override
public void apply(Key key, Value thing)
{
cacheEjects.getAndIncrement() ;
@@ -109,8 +109,12 @@ public class CacheStatsAtomic<Key,Value>
cache.setDropHandler(new EjectMonitor(dropHandler)) ;
}
+ @Override
public final long getCacheEntries() { return cacheEntries.get() ; }
+ @Override
public final long getCacheHits() { return cacheHits.get() ; }
+ @Override
public final long getCacheMisses() { return cacheMisses.get() ; }
+ @Override
public final long getCacheEjects() { return cacheEjects.get() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsSimple.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsSimple.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsSimple.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheStatsSimple.java Wed Oct 19 12:15:05 2011
@@ -39,7 +39,7 @@ public class CacheStatsSimple<Key,Value>
// Wrap any real drop handler.
EjectMonitor(ActionKeyValue<Key,Value> other) { this.other = other ; }
- //@Override
+ @Override
public void apply(Key key, Value thing)
{
cacheEjects++ ;
@@ -98,8 +98,12 @@ public class CacheStatsSimple<Key,Value>
cache.setDropHandler(new EjectMonitor(dropHandler)) ;
}
+ @Override
public final long getCacheEntries() { return cacheEntries ; }
+ @Override
public final long getCacheHits() { return cacheHits ; }
+ @Override
public final long getCacheMisses() { return cacheMisses ; }
+ @Override
public final long getCacheEjects() { return cacheEjects ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSync.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSync.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSync.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheSync.java Wed Oct 19 12:15:05 2011
@@ -30,41 +30,41 @@ public class CacheSync<Key, T> implement
public CacheSync(Cache<Key,T> cache) { this.cache = cache ; }
- //@Override
+ @Override
synchronized
public void clear() { cache.clear(); }
- //@Override
+ @Override
synchronized
public boolean containsKey(Key key) { return cache.containsKey(key) ; }
- //@Override
+ @Override
//public V getObject(K key, boolean exclusive) { return cache.getObject(key, exclusive) ; }
synchronized
public T get(Key key) { return cache.get(key) ; }
- //@Override
+ @Override
synchronized
public boolean isEmpty() { return cache.isEmpty() ; }
- //@Override
+ @Override
synchronized
public Iterator<Key> keys() { return cache.keys(); }
- //@Override
+ @Override
synchronized
public T put(Key key, T thing) { return cache.put(key, thing) ; }
- //@Override
+ @Override
synchronized
public boolean remove(Key key) { return cache.remove(key) ; }
- //@Override
+ @Override
synchronized
public void setDropHandler(ActionKeyValue<Key, T> dropHandler)
{ cache.setDropHandler(dropHandler) ; }
- //@Override
+ @Override
synchronized
public long size() { return cache.size() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheUnbounded.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheUnbounded.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheUnbounded.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheUnbounded.java Wed Oct 19 12:15:05 2011
@@ -36,34 +36,41 @@ public class CacheUnbounded<K,V> impleme
cache = new HashMap<K, V>() ;
}
+ @Override
public void clear()
{ cache.clear() ; }
+ @Override
public boolean containsKey(K key)
{
return cache.containsKey(key) ;
}
+ @Override
public V get(K key)
{
return cache.get(key) ;
}
+ @Override
public boolean isEmpty()
{
return cache.isEmpty() ;
}
+ @Override
public Iterator<K> keys()
{
return cache.keySet().iterator() ;
}
+ @Override
public V put(K key, V thing)
{
return cache.put(key, thing) ;
}
+ @Override
public boolean remove(K key)
{
V value = cache.get(key) ;
@@ -75,11 +82,13 @@ public class CacheUnbounded<K,V> impleme
return true ;
}
+ @Override
public void setDropHandler(ActionKeyValue<K, V> dropHandler)
{
this.dropHandler = dropHandler ;
}
+ @Override
public long size()
{
return cache.size() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/cache/CacheWrapper.java Wed Oct 19 12:15:05 2011
@@ -30,33 +30,33 @@ public class CacheWrapper<Key,T> impleme
public CacheWrapper(Cache<Key,T> cache) { this.cache = cache ; }
- //@Override
+ @Override
public void clear() { cache.clear(); }
- //@Override
+ @Override
public boolean containsKey(Key key) { return cache.containsKey(key) ; }
- //@Override
+ @Override
//public V getObject(K key, boolean exclusive) { return cache.getObject(key, exclusive) ; }
public T get(Key key) { return cache.get(key) ; }
- //@Override
+ @Override
public boolean isEmpty() { return cache.isEmpty() ; }
- //@Override
+ @Override
public Iterator<Key> keys() { return cache.keys(); }
- //@Override
+ @Override
public T put(Key key, T thing) { return cache.put(key, thing) ; }
- //@Override
+ @Override
public boolean remove(Key key) { return cache.remove(key) ; }
- //@Override
+ @Override
public void setDropHandler(ActionKeyValue<Key, T> dropHandler)
{ cache.setDropHandler(dropHandler) ; }
- //@Override
+ @Override
public long size() { return cache.size() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/ErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/ErrorHandlerFactory.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/ErrorHandlerFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/ErrorHandlerFactory.java Wed Oct 19 12:15:05 2011
@@ -84,11 +84,14 @@ public class ErrorHandlerFactory
/** Ignores warnings, throws exceptions for errors */
private static class ErrorHandlerSimple implements ErrorHandler
{
+ @Override
public void warning(String message, long line, long col)
{}
+ @Override
public void error(String message, long line, long col)
{ throw new RiotException(fmtMessage(message, line, col)) ; }
+ @Override
public void fatal(String message, long line, long col)
{ throw new RiotException(fmtMessage(message, line, col)) ; }
}
@@ -102,12 +105,12 @@ public class ErrorHandlerFactory
}
/** report a warning */
- //@Override
+ @Override
public void warning(String message, long line, long col)
{ logWarning(message, line, col) ; }
/** report an error */
- //@Override
+ @Override
public void error(String message, long line, long col)
{
logError(message, line, col) ;
@@ -115,7 +118,7 @@ public class ErrorHandlerFactory
}
/** report a fatal error - does not return */
- //@Override
+ @Override
public void fatal(String message, long line, long col)
{
logFatal(message, line, col) ;
@@ -132,7 +135,7 @@ public class ErrorHandlerFactory
}
/** report a warning - do not carry on */
- //@Override
+ @Override
public void warning(String message, long line, long col)
{
logWarning(message, line, col) ;
@@ -140,13 +143,14 @@ public class ErrorHandlerFactory
}
/** report an error - do not carry on */
- //@Override
+ @Override
public void error(String message, long line, long col)
{
logError(message, line, col) ;
throw new RiotException(fmtMessage(message, line, col)) ;
}
+ @Override
public void fatal(String message, long line, long col)
{
logFatal(message, line, col) ;
@@ -160,16 +164,16 @@ public class ErrorHandlerFactory
public ErrorHandlerWarning(Logger log)
{ super(log) ; }
- //@Override
+ @Override
public void warning(String message, long line, long col)
{ logWarning(message, line, col) ; }
/** report an error but continue */
- //@Override
+ @Override
public void error(String message, long line, long col)
{ logError(message, line, col) ; }
- //@Override
+ @Override
public void fatal(String message, long line, long col)
{
logFatal(message, line, col) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/SerializationFactoryFinder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/SerializationFactoryFinder.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/SerializationFactoryFinder.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/SerializationFactoryFinder.java Wed Oct 19 12:15:05 2011
@@ -48,16 +48,19 @@ public class SerializationFactoryFinder
{
return new SerializationFactory<Binding>()
{
+ @Override
public Sink<Binding> createSerializer(OutputStream out)
{
return new BindingOutputStream(out);
}
+ @Override
public Iterator<Binding> createDeserializer(InputStream in)
{
return new BindingInputStream(in);
}
+ @Override
public long getEstimatedMemorySize(Binding item)
{
// TODO traverse the binding, and add up the variable + node sizes + object overhead
@@ -70,11 +73,13 @@ public class SerializationFactoryFinder
{
return new SerializationFactory<Triple>()
{
+ @Override
public Sink<Triple> createSerializer(OutputStream out)
{
return new SinkTripleOutput(out, null, NodeToLabel.createBNodeByLabelEncoded()) ;
}
+ @Override
public Iterator<Triple> createDeserializer(InputStream in)
{
Tokenizer tokenizer = TokenizerFactory.makeTokenizerASCII(in) ;
@@ -83,6 +88,7 @@ public class SerializationFactoryFinder
return parser ;
}
+ @Override
public long getEstimatedMemorySize(Triple item)
{
// TODO
@@ -95,11 +101,13 @@ public class SerializationFactoryFinder
{
return new SerializationFactory<Quad>()
{
+ @Override
public Sink<Quad> createSerializer(OutputStream out)
{
return new SinkQuadOutput(out, null, NodeToLabel.createBNodeByLabelEncoded()) ;
}
+ @Override
public Iterator<Quad> createDeserializer(InputStream in)
{
Tokenizer tokenizer = TokenizerFactory.makeTokenizerASCII(in) ;
@@ -108,6 +116,7 @@ public class SerializationFactoryFinder
return parser ;
}
+ @Override
public long getEstimatedMemorySize(Quad item)
{
// TODO
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerBlankNodes.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerBlankNodes.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerBlankNodes.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerBlankNodes.java Wed Oct 19 12:15:05 2011
@@ -31,6 +31,7 @@ public class CheckerBlankNodes implement
this.handler = handler ;
}
+ @Override
public boolean check(Node node, long line, long col)
{ return node.isBlank() && checkBlank(node, line, col) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerIRI.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerIRI.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerIRI.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerIRI.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class CheckerIRI implements NodeC
this.iriFactory = iriFactory ;
}
+ @Override
public boolean check(Node node, long line, long col)
{ return node.isURI() && checkURI(node, line, col) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerLiterals.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerLiterals.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerLiterals.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerLiterals.java Wed Oct 19 12:15:05 2011
@@ -46,6 +46,7 @@ public class CheckerLiterals implements
this.handler = handler ;
}
+ @Override
public boolean check(Node node, long line, long col)
{ return node.isLiteral() && checkLiteral(node, handler, line, col) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVar.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVar.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVar.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVar.java Wed Oct 19 12:15:05 2011
@@ -32,6 +32,7 @@ public class CheckerVar implements NodeC
this.handler = handler ;
}
+ @Override
public boolean check(Node node, long line, long col)
{ return Var.isVar(node) && checkVar(node, line, col) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVisitor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVisitor.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVisitor.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/CheckerVisitor.java Wed Oct 19 12:15:05 2011
@@ -29,26 +29,31 @@ import com.hp.hpl.jena.rdf.model.AnonId
public class CheckerVisitor implements NodeVisitor
{
+ @Override
public Object visitAny(Node_ANY it)
{
return null ;
}
+ @Override
public Object visitBlank(Node_Blank it, AnonId id)
{
return null ;
}
+ @Override
public Object visitLiteral(Node_Literal it, LiteralLabel lit)
{
return null ;
}
+ @Override
public Object visitURI(Node_URI it, String uri)
{
return null ;
}
+ @Override
public Object visitVariable(Node_Variable it, String name)
{
return null ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/NodeCheckerNull.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/NodeCheckerNull.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/NodeCheckerNull.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/checker/NodeCheckerNull.java Wed Oct 19 12:15:05 2011
@@ -22,5 +22,6 @@ import com.hp.hpl.jena.graph.Node ;
public class NodeCheckerNull implements NodeChecker
{
+ @Override
public boolean check(Node node, long line, long col) { return true ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LabelToNode.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LabelToNode.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LabelToNode.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LabelToNode.java Wed Oct 19 12:15:05 2011
@@ -74,7 +74,9 @@ public class LabelToNode extends MapWith
private static class SingleScopePolicy implements ScopePolicy<String, Node, Node>
{
private Map<String, Node> map = new HashMap<String, Node>() ;
+ @Override
public Map<String, Node> getScope(Node scope) { return map ; }
+ @Override
public void clear() { map.clear(); }
}
@@ -83,6 +85,7 @@ public class LabelToNode extends MapWith
{
private Map<String, Node> dftMap = new HashMap<String, Node>() ;
private Map<Node, Map<String, Node>> map = new HashMap<Node, Map<String, Node>>() ;
+ @Override
public Map<String, Node> getScope(Node scope)
{
if ( scope == null )
@@ -96,6 +99,7 @@ public class LabelToNode extends MapWith
}
return x ;
}
+ @Override
public void clear() { map.clear(); }
}
@@ -103,9 +107,11 @@ public class LabelToNode extends MapWith
private static Allocator<String, Node> nodeMaker = new Allocator<String, Node>()
{
+ @Override
public Node create(String label)
{ return Node.createAnon() ; }
+ @Override
public void reset() {}
} ;
@@ -113,12 +119,14 @@ public class LabelToNode extends MapWith
{
private long counter = 0 ;
+ @Override
public Node create(String label)
{
String $ = format("B0x%04X", ++counter) ;
return Node.createAnon(new AnonId($)) ;
}
+ @Override
public void reset() {}
} ;
@@ -126,6 +134,7 @@ public class LabelToNode extends MapWith
{
private long counter = 0 ;
+ @Override
public Node create(String label)
{
if ( label == null )
@@ -133,6 +142,7 @@ public class LabelToNode extends MapWith
return Node.createAnon(new AnonId(label)) ;
}
+ @Override
public void reset() {}
} ;
@@ -140,6 +150,7 @@ public class LabelToNode extends MapWith
{
private long counter = 0 ;
+ @Override
public Node create(String label)
{
if ( label == null )
@@ -147,6 +158,7 @@ public class LabelToNode extends MapWith
return Node.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(label))) ;
}
+ @Override
public void reset() {}
} ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangBase.java Wed Oct 19 12:15:05 2011
@@ -36,6 +36,7 @@ public abstract class LangBase<X> extend
this.sink = sink ;
}
+ @Override
public void parse()
{
EventManager.send(sink, new Event(SysRIOT.startRead, null)) ;
@@ -48,11 +49,13 @@ public abstract class LangBase<X> extend
/** Run the parser - events have been handled. */
protected abstract void runParser() ;
+ @Override
public ParserProfile getProfile()
{
return profile ;
}
+ @Override
public void setProfile(ParserProfile profile)
{
super.profile = profile ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNQuads.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNQuads.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNQuads.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNQuads.java Wed Oct 19 12:15:05 2011
@@ -41,7 +41,7 @@ public class LangNQuads extends LangNTup
super(tokens, profile, sink) ;
}
- //@Override
+ @Override
public Lang getLang() { return Lang.NQUADS ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTriples.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTriples.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTriples.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTriples.java Wed Oct 19 12:15:05 2011
@@ -41,7 +41,7 @@ public final class LangNTriples extends
super(tokens, profile, sink) ;
}
- //@Override
+ @Override
public Lang getLang() { return Lang.NTRIPLES ; }
// static final Node X = Node.createURI("http://example") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTuple.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTuple.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTuple.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangNTuple.java Wed Oct 19 12:15:05 2011
@@ -73,19 +73,19 @@ public abstract class LangNTuple<X> exte
}
// Assumes no syntax errors.
- //@Override
+ @Override
public final boolean hasNext()
{
return super.moreTokens() ;
}
- //@Override
+ @Override
public final X next()
{
return parseOne() ;
}
- //@Override
+ @Override
public final void remove()
{ throw new UnsupportedOperationException(); }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFJSON.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFJSON.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFJSON.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFJSON.java Wed Oct 19 12:15:05 2011
@@ -47,7 +47,8 @@ public class LangRDFJSON extends LangBas
}
}
- public Lang getLang()
+ @Override
+ public Lang getLang()
{
return Lang.RDFJSON ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFXML.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFXML.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFXML.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangRDFXML.java Wed Oct 19 12:15:05 2011
@@ -58,11 +58,13 @@ public class LangRDFXML implements LangR
private Sink<Triple> sink ;
private ParserProfile profile ; // Warning - we don't use all of this.
+ @Override
public ParserProfile getProfile()
{
return profile ;
}
+ @Override
public void setProfile(ParserProfile profile)
{ this.profile = profile ; }
@@ -85,10 +87,11 @@ public class LangRDFXML implements LangR
this.profile = RiotLib.profile(getLang(), xmlBase, errorHandler) ;
}
- //@Override
+ @Override
public Lang getLang() { return Lang.RDFXML ; }
+ @Override
public void parse()
{
// Hacked out of ARP because of all the "private" methods
@@ -125,9 +128,11 @@ public class LangRDFXML implements LangR
this.checker = new CheckerLiterals(errHandler) ;
}
+ @Override
public void statement(AResource subj, AResource pred, AResource obj)
{ sink.send(convert(subj, pred, obj)); }
+ @Override
public void statement(AResource subj, AResource pred, ALiteral lit)
{ sink.send(convert(subj, pred, lit)) ; }
@@ -172,9 +177,11 @@ public class LangRDFXML implements LangR
return Triple.create(convert(s), convert(p), object);
}
+ @Override
public void endPrefixMapping(String prefix)
{}
+ @Override
public void startPrefixMapping(String prefix, String uri)
{}
}
@@ -188,8 +195,11 @@ public class LangRDFXML implements LangR
this.errorHandler = hander ;
}
+ @Override
public void warning(Exception e) { errorHandler.warning(e.getMessage(), -1, -1) ; }
+ @Override
public void error(Exception e) { errorHandler.error(e.getMessage(), -1, -1) ; }
+ @Override
public void fatalError(Exception e) { errorHandler.fatal(e.getMessage(), -1, -1) ; }
}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTriG.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTriG.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTriG.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTriG.java Wed Oct 19 12:15:05 2011
@@ -57,7 +57,7 @@ public class LangTriG extends LangTurtle
super(baseURI, tokens, profile, sink) ;
}
- //@Override
+ @Override
public Lang getLang() { return Lang.TRIG ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTurtle.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTurtle.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTurtle.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/LangTurtle.java Wed Oct 19 12:15:05 2011
@@ -37,7 +37,7 @@ public class LangTurtle extends LangTurt
setCurrentGraph(null) ;
}
- //@Override
+ @Override
public Lang getLang() { return Lang.TURTLE ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/PrintingSink.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/PrintingSink.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/PrintingSink.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/PrintingSink.java Wed Oct 19 12:15:05 2011
@@ -30,16 +30,16 @@ public class PrintingSink implements Sin
public PrintingSink(Logger log) { this.log = log ; }
- //@Override
+ @Override
public void send(Triple triple)
{
String string = NodeFmtLib.str(triple) ;
log.info(string) ;
}
- //@Override
+ @Override
public void flush() { }
- //@Override
+ @Override
public void close() { }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkQuadsToDataset.java Wed Oct 19 12:15:05 2011
@@ -36,6 +36,7 @@ public class SinkQuadsToDataset implemen
this.dataset = dataset ;
}
+ @Override
public void send(Quad quad)
{
if ( quad.isTriple() )
@@ -44,11 +45,13 @@ public class SinkQuadsToDataset implemen
dataset.add(quad) ;
}
+ @Override
public void flush()
{
SystemARQ.sync(dataset) ;
}
+ @Override
public void close()
{}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/lang/SinkTriplesToGraph.java Wed Oct 19 12:15:05 2011
@@ -48,7 +48,7 @@ public class SinkTriplesToGraph implemen
// Convert between the new global event system (EventManager)
// and old style Jena graph events.
el1 = new EventListener(){
- //@Override
+ @Override
public void event(Object dest, Event event)
{
graph.getEventManager().notifyEvent( graph , GraphEvents.startRead ) ;
@@ -56,7 +56,7 @@ public class SinkTriplesToGraph implemen
} ;
el2 = new EventListener(){
- //@Override
+ @Override
public void event(Object dest, Event event)
{
graph.getEventManager().notifyEvent( graph , GraphEvents.finishRead ) ;
@@ -66,15 +66,16 @@ public class SinkTriplesToGraph implemen
EventManager.register(this, finishRead, el2) ;
}
+ @Override
public void send(Triple triple)
{
graph.add(triple) ;
}
- //@Override
+ @Override
public void flush() { SystemARQ.sync(graph) ; }
- //@Override
+ @Override
public void close()
{
EventManager.unregister(this, finishRead, el2) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterBase.java Wed Oct 19 12:15:05 2011
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.sparql.ARQInterna
*/
public abstract class NodeFormatterBase implements NodeFormatter
{
- //@Override
+ @Override
public void format(Writer w, Node n)
{
if ( n.isBlank() )
@@ -49,13 +49,13 @@ public abstract class NodeFormatterBase
throw new ARQInternalErrorException("Unknow node type: "+n) ;
}
- //@Override
+ @Override
public void formatURI(Writer w, Node n) { formatURI(w, n.getURI()) ; }
- //@Override
+ @Override
public void formatBNode(Writer w, Node n) { formatBNode(w, n.getBlankNodeLabel()) ; }
- //@Override
+ @Override
public void formatLiteral(Writer w, Node n)
{
String dt = n.getLiteralDatatypeURI() ;
@@ -73,6 +73,6 @@ public abstract class NodeFormatterBase
formatLitDT(w, lex, dt) ;
}
- //@Override
+ @Override
public void formatVar(Writer w, Node n) { formatVar(w, n.getName()) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterNT.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterNT.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterNT.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeFormatterNT.java Wed Oct 19 12:15:05 2011
@@ -34,7 +34,7 @@ public class NodeFormatterNT extends Nod
protected NodeFormatterNT(boolean asciiOnly) { escapeProc = new EscapeStr(asciiOnly) ;}
- //@Override
+ @Override
public void formatURI(Writer w, String uriStr)
{
try {
@@ -44,7 +44,7 @@ public class NodeFormatterNT extends Nod
} catch (IOException ex) { IO.exception(ex) ; }
}
- //@Override
+ @Override
public void formatVar(Writer w, String name)
{
try {
@@ -53,7 +53,7 @@ public class NodeFormatterNT extends Nod
} catch (IOException ex) { IO.exception(ex) ; }
}
- //@Override
+ @Override
public void formatBNode(Writer w, String label)
{
try {
@@ -63,7 +63,7 @@ public class NodeFormatterNT extends Nod
} catch (IOException ex) { IO.exception(ex) ; }
}
- //@Override
+ @Override
public void formatLitString(Writer w, String lex)
{
try {
@@ -78,7 +78,7 @@ public class NodeFormatterNT extends Nod
w.write('"') ;
}
- //@Override
+ @Override
public void formatLitLang(Writer w, String lex, String langTag)
{
try {
@@ -88,7 +88,7 @@ public class NodeFormatterNT extends Nod
} catch (IOException ex) { IO.exception(ex) ; }
}
- //@Override
+ @Override
public void formatLitDT(Writer w, String lex, String datatypeURI)
{
try {
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeToLabel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeToLabel.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeToLabel.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/NodeToLabel.java Wed Oct 19 12:15:05 2011
@@ -68,7 +68,9 @@ public class NodeToLabel extends MapWith
private static class SingleScopePolicy implements ScopePolicy<Node, String, Node>
{
private Map<Node, String> map = new HashMap<Node, String>() ;
+ @Override
public Map<Node, String> getScope(Node scope) { return map ; }
+ @Override
public void clear() { map.clear(); }
}
@@ -77,6 +79,7 @@ public class NodeToLabel extends MapWith
{
private Map<Node, String> dftMap = new HashMap<Node, String>() ;
private Map<Node, Map<Node, String>> map = new HashMap<Node, Map<Node, String>>() ;
+ @Override
public Map<Node, String> getScope(Node scope)
{
if ( scope == null )
@@ -90,6 +93,7 @@ public class NodeToLabel extends MapWith
}
return x ;
}
+ @Override
public void clear() { map.clear(); }
}
@@ -101,6 +105,7 @@ public class NodeToLabel extends MapWith
// abstract to make you think about the policy!
private long counter = 0 ;
+ @Override
public final String create(Node node)
{
if ( node.isURI() ) return labelForURI(node) ;
@@ -129,6 +134,7 @@ public class NodeToLabel extends MapWith
{
return "?"+node.getName() ;
}
+ @Override
public void reset() {}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkEntityOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkEntityOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkEntityOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkEntityOutput.java Wed Oct 19 12:15:05 2011
@@ -61,7 +61,7 @@ public class SinkEntityOutput implements
this.labelPolicy = labels ;
}
- //@Override
+ @Override
public void send(Pair<Node, Map<Node, Set<Node>>> item) {
Node s = item.getLeft() ;
if ( s.isBlank() ) {
@@ -104,13 +104,13 @@ public class SinkEntityOutput implements
out.finishObject() ;
}
- //@Override
+ @Override
public void flush() {
out.finishObject() ;
out.finishOutput();
}
- //@Override
+ @Override
public void close() {
flush() ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkQuadOutput.java Wed Oct 19 12:15:05 2011
@@ -64,11 +64,13 @@ public class SinkQuadOutput implements S
}
+ @Override
public void flush()
{
out.flush() ;
}
+ @Override
public void send(Quad quad)
{
Node s = quad.getSubject() ;
@@ -96,6 +98,7 @@ public class SinkQuadOutput implements S
return ( g != null && g != Quad.tripleInQuad && ! Quad.isDefaultGraph(g) ) ;
}
+ @Override
public void close()
{
flush();
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/out/SinkTripleOutput.java Wed Oct 19 12:15:05 2011
@@ -66,11 +66,13 @@ public class SinkTripleOutput implements
this.labelPolicy = labels ;
}
+ @Override
public void flush()
{
out.flush() ;
}
+ @Override
public void send(Triple triple)
{
Node s = triple.getSubject() ;
@@ -85,6 +87,7 @@ public class SinkTripleOutput implements
out.output(" .\n") ;
}
+ @Override
public void close()
{
flush();
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorQuads.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorQuads.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorQuads.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorQuads.java Wed Oct 19 12:15:05 2011
@@ -43,6 +43,7 @@ class InferenceProcessorQuads implements
}
+ @Override
public void send(Quad quad)
{
output.send(quad) ;
@@ -51,9 +52,11 @@ class InferenceProcessorQuads implements
rdfs.process(quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
}
+ @Override
public void flush()
{ output.flush() ; }
+ @Override
public void close()
{ output.close() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorRDFS.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorRDFS.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorRDFS.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorRDFS.java Wed Oct 19 12:15:05 2011
@@ -65,6 +65,7 @@ abstract class InferenceProcessorRDFS im
this.state = state ;
}
+ @Override
public void process(Node s, Node p, Node o)
{
subClass(s,p,o) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorTriples.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorTriples.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorTriples.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/inf/InferenceProcessorTriples.java Wed Oct 19 12:15:05 2011
@@ -42,15 +42,18 @@ class InferenceProcessorTriples implemen
}
+ @Override
public void send(Triple triple)
{
output.send(triple) ;
rdfs.process(triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
}
+ @Override
public void flush()
{ output.flush() ; }
+ @Override
public void close()
{ output.close() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/CanonicalizeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/CanonicalizeLiteral.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/CanonicalizeLiteral.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/CanonicalizeLiteral.java Wed Oct 19 12:15:05 2011
@@ -38,6 +38,7 @@ public class CanonicalizeLiteral impleme
private CanonicalizeLiteral() {}
+ @Override
public Node convert(Node node)
{
if ( ! node.isLiteral() )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java Wed Oct 19 12:15:05 2011
@@ -44,6 +44,7 @@ class NormalizeValue
// See Normalizevalue2 for "faster" versions (less parsing overhead).
static DatatypeHandler dtBoolean = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
if ( lexicalForm.equals("1") ) return NodeConst.nodeTrue ;
@@ -62,6 +63,7 @@ class NormalizeValue
}
static DatatypeHandler dtAnyDateTime = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
// Fast test:
@@ -117,6 +119,7 @@ class NormalizeValue
static DatatypeHandler dtDateTime = dtAnyDateTime ;
static DatatypeHandler dtInteger = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
char[] chars = lexicalForm.toCharArray() ;
@@ -149,6 +152,7 @@ class NormalizeValue
} ;
static DatatypeHandler dtDecimal = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
BigDecimal bd = new BigDecimal(lexicalForm).stripTrailingZeros() ;
@@ -183,6 +187,7 @@ class NormalizeValue
*/
static DatatypeHandler dtDouble = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
double d = Double.parseDouble(lexicalForm) ;
@@ -194,6 +199,7 @@ class NormalizeValue
} ;
static DatatypeHandler dtFloat = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
float f = Float.parseFloat(lexicalForm) ;
@@ -206,6 +212,7 @@ class NormalizeValue
/** Convert xsd:string to simple literal */
static DatatypeHandler dtXSDString = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
return Node.createLiteral(lexicalForm) ;
@@ -214,6 +221,7 @@ class NormalizeValue
/** Convert simple literal to xsd:string */
static DatatypeHandler dtSimpleLiteral = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
return Node.createLiteral(lexicalForm, "", datatype) ;
@@ -222,6 +230,7 @@ class NormalizeValue
static DatatypeHandler dtPlainLiteral = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
int idx = lexicalForm.lastIndexOf('@') ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue2.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue2.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue2.java Wed Oct 19 12:15:05 2011
@@ -120,6 +120,7 @@ class NormalizeValue2
// --- Working versions
static DatatypeHandler dtInteger = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
char[] chars = lexicalForm.toCharArray() ;
@@ -136,6 +137,7 @@ class NormalizeValue2
} ;
static DatatypeHandler dtDecimal = new DatatypeHandler() {
+ @Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
// Need to force "0."
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/IRIResolver.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/IRIResolver.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/IRIResolver.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/IRIResolver.java Wed Oct 19 12:15:05 2011
@@ -295,6 +295,7 @@ public abstract class IRIResolver
protected IRIResolverNoOp() {}
final private Getter<String, IRI> getter = new Getter<String, IRI>() {
+ @Override
public IRI get(String relURI) { return iriFactory.create(relURI) ; }
} ;
private Cache<String, IRI> resolvedIRIs = CacheFactory.createCache(getter, CacheSize) ;
@@ -336,6 +337,7 @@ public abstract class IRIResolver
final private IRI base;
// The cache. Maybe this should be in Prologue.
final private Getter<String, IRI> getter = new Getter<String, IRI>() {
+ @Override
public IRI get(String relURI) { return base.resolve(relURI) ; }
} ;
// Not static - contains relative IRIs
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaReaderRIOT.java Wed Oct 19 12:15:05 2011
@@ -46,6 +46,7 @@ public abstract class JenaReaderRIOT imp
protected JenaReaderRIOT() {}
+ @Override
final
public void read(Model model, Reader r, String base)
{
@@ -53,6 +54,7 @@ public abstract class JenaReaderRIOT imp
readImpl(model, makeTokenizer(r), base) ;
}
+ @Override
final
public void read(Model model, String url)
{
@@ -86,6 +88,7 @@ public abstract class JenaReaderRIOT imp
}
}
+ @Override
final
public void read(Model model, InputStream in, String base)
{
@@ -104,6 +107,7 @@ public abstract class JenaReaderRIOT imp
return TokenizerFactory.makeTokenizer(r) ;
}
+ @Override
final
public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
{
@@ -112,6 +116,7 @@ public abstract class JenaReaderRIOT imp
return old ;
}
+ @Override
final
public Object setProperty(String propName, Object propValue)
{ return null ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaWriterBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaWriterBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaWriterBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/JenaWriterBase.java Wed Oct 19 12:15:05 2011
@@ -36,6 +36,7 @@ public abstract class JenaWriterBase imp
protected Map<String, String> writerPropertyMap = new HashMap<String, String>() ;
private RDFErrorHandler errorHandler = null ;
+ @Override
public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
{
RDFErrorHandler old = errorHandler;
@@ -43,6 +44,7 @@ public abstract class JenaWriterBase imp
return old;
}
+ @Override
public Object setProperty(String propName, Object propValue)
{
if ( ! ( propValue instanceof String ) )
@@ -66,11 +68,13 @@ public abstract class JenaWriterBase imp
return propName ;
}
+ @Override
public void write(Model model, Writer out, String base)
{
write(model.getGraph(), out, base) ;
}
+ @Override
public void write(Model model, OutputStream out, String base)
{
BufferingWriter buff = BufferingWriter.create(out, 1023) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/ParserProfileBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/ParserProfileBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/ParserProfileBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/ParserProfileBase.java Wed Oct 19 12:15:05 2011
@@ -52,89 +52,89 @@ public class ParserProfileBase implement
this.labelMapping = labelMapping ;
}
- //@Override
+ @Override
public ErrorHandler getHandler() { return errorHandler ; }
- //@Override
+ @Override
public void setHandler(ErrorHandler handler) { errorHandler = handler ; }
- //@Override
+ @Override
public Prologue getPrologue() { return prologue ; }
- //@Override
+ @Override
public void setPrologue(Prologue p) { prologue = p ; }
- //@Override
+ @Override
public LabelToNode getLabelToNode()
{ return labelMapping ; }
- //@Override
+ @Override
public void setLabelToNode(LabelToNode mapper) { labelMapping = mapper ; }
- //@Override
+ @Override
public String resolveIRI(String uriStr, long line, long col)
{
return makeIRI(uriStr, line, col).toString() ;
}
- //@Override
+ @Override
public IRI makeIRI(String uriStr, long line, long col)
{
IRI iri = prologue.getResolver().resolve(uriStr) ;
return iri ;
}
- //@Override
+ @Override
public Quad createQuad(Node g, Node s, Node p, Node o, long line, long col)
{
return new Quad(g,s,p,o) ;
}
- //@Override
+ @Override
public Triple createTriple(Node s, Node p, Node o, long line, long col)
{
return new Triple(s, p, o) ;
}
- //@Override
+ @Override
public Node createURI(String uriStr, long line, long col)
{
return Node.createURI(uriStr) ;
}
- //@Override
+ @Override
public Node createBlankNode(Node scope, String label, long line, long col)
{
return labelMapping.get(scope, label) ;
}
-// //@Override
+// @Override
// public Node createTypedLiteral(String lexical, String datatype, long line, long col)
// {
// RDFDatatype dt = Node.getType(datatype) ;
// return createTypedLiteral(lexical, dt, line, col) ;
// }
- //@Override
+ @Override
public Node createTypedLiteral(String lexical, RDFDatatype dt, long line, long col)
{
return Node.createLiteral(lexical, null, dt) ;
}
- //@Override
+ @Override
public Node createLangLiteral(String lexical, String langTag, long line, long col)
{
return Node.createLiteral(lexical, langTag, null) ;
}
- //@Override
+ @Override
public Node createPlainLiteral(String lexical, long line, long col)
{
return Node.createLiteral(lexical) ;
}
/** Special token forms*/
- //@Override
+ @Override
public Node createNodeFromToken(Node scope, Token token, long line, long col)
{
// OFF - Don't produce Node.ANY by default.
@@ -146,7 +146,7 @@ public class ParserProfileBase implement
return null ;
}
- //@Override
+ @Override
public Node create(Node currentGraph, Token token)
{
// Dispatches to the underlying operation
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/SinkExtendTriplesToQuads.java Wed Oct 19 12:15:05 2011
@@ -44,17 +44,20 @@ public class SinkExtendTriplesToQuads im
this.graph = gn ;
}
+ @Override
public void send(Triple triple)
{
Quad q = new Quad(graph, triple) ;
quadSink.send(q) ;
}
+ @Override
public void flush()
{
quadSink.flush() ;
}
+ @Override
public void close()
{
// Don't close - the underlying sink may be reused.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenCheckerBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenCheckerBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenCheckerBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenCheckerBase.java Wed Oct 19 12:15:05 2011
@@ -22,47 +22,47 @@ package org.openjena.riot.tokens;
public class TokenCheckerBase implements TokenChecker
{
- //@Override
+ @Override
public void checkBlankNode(String blankNodeLabel)
{}
- //@Override
+ @Override
public void checkControl(int code)
{}
- //@Override
+ @Override
public void checkDirective(int cntrlCode)
{}
- //@Override
+ @Override
public void checkKeyword(String lexical)
{}
- //@Override
+ @Override
public void checkLiteralDT(String lexicalForm, Token datatype)
{}
- //@Override
+ @Override
public void checkLiteralLang(String lexicalForm, String langTag)
{}
- //@Override
+ @Override
public void checkNumber(String lexical, String datatypeURI)
{}
- //@Override
+ @Override
public void checkPrefixedName(String prefixName, String localName)
{}
- //@Override
+ @Override
public void checkString(String string)
{}
- //@Override
+ @Override
public void checkURI(String uriStr)
{}
- //@Override
+ @Override
public void checkVariable(String tokenImage)
{}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/Tokenizer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/Tokenizer.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/Tokenizer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/Tokenizer.java Wed Oct 19 12:15:05 2011
@@ -26,9 +26,11 @@ import org.openjena.atlas.lib.Closeable
public interface Tokenizer extends Iterator<Token>, Closeable
{
/** Is there another token? */
+ @Override
public boolean hasNext() ;
/** Move to next token */
+ @Override
public Token next() ;
/** Peek next token : null for no token. */
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerBytes.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerBytes.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerBytes.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerBytes.java Wed Oct 19 12:15:05 2011
@@ -82,7 +82,7 @@ public final class TokenizerBytes implem
}
// Share with TokenizerText
- //@Override
+ @Override
public final boolean hasNext()
{
if ( finished )
@@ -114,7 +114,7 @@ public final class TokenizerBytes implem
}
}
- //@Override
+ @Override
public final Token next()
{
if ( ! hasNext() )
@@ -125,25 +125,27 @@ public final class TokenizerBytes implem
}
+ @Override
public final Token peek()
{
if ( ! hasNext() ) return null ;
return token ;
}
+ @Override
public final boolean eof()
{
return hasNext() ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
public TokenChecker getChecker() { return checker ; }
public void setChecker(TokenChecker checker) { this.checker = checker ; }
- //@Override
+ @Override
public void close()
{
try { inputStream.close() ; }
@@ -809,11 +811,13 @@ public final class TokenizerBytes implem
+ @Override
public long getColumn()
{
return inputStream.getColNum() ;
}
+ @Override
public long getLine()
{
return inputStream.getLineNum() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java Wed Oct 19 12:15:05 2011
@@ -93,7 +93,7 @@ public final class TokenizerText impleme
this.reader = reader ;
}
- //@Override
+ @Override
public final boolean hasNext()
{
if ( finished )
@@ -130,12 +130,13 @@ public final class TokenizerText impleme
}
+ @Override
public final boolean eof()
{
return hasNext() ;
}
- //@Override
+ @Override
public final Token next()
{
if ( ! hasNext() )
@@ -145,21 +146,21 @@ public final class TokenizerText impleme
return t ;
}
- //@Override
+ @Override
public final Token peek()
{
if ( ! hasNext() ) return null ;
return token ;
}
- //@Override
+ @Override
public void remove()
{ throw new UnsupportedOperationException() ; }
public TokenChecker getChecker() { return checker ; }
public void setChecker(TokenChecker checker) { this.checker = checker ; }
- //@Override
+ @Override
public void close()
{
IO.close(reader) ;
@@ -1021,11 +1022,13 @@ public final class TokenizerText impleme
}
}
+ @Override
public long getColumn()
{
return reader.getColNum() ;
}
+ @Override
public long getLine()
{
return reader.getLineNum() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerWrapper.java Wed Oct 19 12:15:05 2011
@@ -28,47 +28,51 @@ public class TokenizerWrapper implements
this.other = other ;
}
- //@Override
+ @Override
public long getColumn()
{
return other.getColumn() ;
}
- //@Override
+ @Override
public long getLine()
{
return other.getLine() ;
}
- //@Override
+ @Override
public boolean hasNext()
{
return other.hasNext() ;
}
+ @Override
public boolean eof()
{
return other.eof() ;
}
- //@Override
+ @Override
public Token next()
{
return other.next();
}
+ @Override
public Token peek()
{
return other.peek() ;
}
// @Override
+ @Override
public void remove()
{
other.remove() ;
}
// @Override
+ @Override
public void close()
{
other.close() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/web/HttpResponseLib.java Wed Oct 19 12:15:05 2011
@@ -50,7 +50,7 @@ public class HttpResponseLib
static abstract class AbstractGraphReader implements HttpCaptureResponse<Graph>
{
private Graph graph = null ;
- //@Override
+ @Override
final public void handle(String contentType, String baseIRI, HttpResponse response)
{
try {
@@ -67,7 +67,7 @@ public class HttpResponseLib
} catch (IOException ex) { IO.exception(ex) ; }
}
- //@Override
+ @Override
public Graph get() { return graph ; }
abstract protected LangRIOT createParser(InputStream in, String baseIRI, Sink<Triple> sink) ;
@@ -75,7 +75,7 @@ public class HttpResponseLib
public static HttpResponseHandler httpDumpResponse = new HttpResponseHandler()
{
- //@Override
+ @Override
public void handle(String contentType, String baseIRI, HttpResponse response)
{
try {
@@ -134,7 +134,7 @@ public class HttpResponseLib
public static class HttpCaptureResponseResultSet implements HttpCaptureResponse<ResultSet>
{
ResultSet rs = null ;
- //@Override
+ @Override
public void handle(String contentType, String baseIRI, HttpResponse response) throws IOException
{
MediaType mt = new MediaType(contentType) ;
@@ -145,7 +145,7 @@ public class HttpResponseLib
rs = ResultSetFactory.copyResults(rs) ;
}
- //@Override
+ @Override
public ResultSet get()
{
return rs ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/riotcmd/CmdLangParse.java Wed Oct 19 12:15:05 2011
@@ -77,17 +77,23 @@ public abstract class CmdLangParse exten
static LangHandler langHandlerQuads = new LangHandler()
{
+ @Override
public String getItemsName() { return "quads" ; }
+ @Override
public String getRateName() { return "QPS" ; }
} ;
static LangHandler langHandlerTriples = new LangHandler()
{
+ @Override
public String getItemsName() { return "triples" ; }
+ @Override
public String getRateName() { return "TPS" ; }
} ;
static LangHandler langHandlerAny = new LangHandler()
{
+ @Override
public String getItemsName() { return "tuples" ; }
+ @Override
public String getRateName() { return "TPS" ; }
} ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DSG_Mem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DSG_Mem.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DSG_Mem.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/core/DSG_Mem.java Wed Oct 19 12:15:05 2011
@@ -210,6 +210,7 @@ public class DSG_Mem extends DatasetGrap
return graphNodes().contains(graphNode) ;
}
+ @Override
public Iterator<Node> listGraphNodes()
{
return graphNodes().iterator() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java Wed Oct 19 12:15:05 2011
@@ -82,7 +82,7 @@ public class TestQueryIterSort {
iterator = new CallbackIterator(unsorted.iterator(), 25, null);
iterator.setCallback(new Callback() {
- //@Override
+ @Override
public void call() { throw new QueryCancelledException() ; }
});
}
@@ -90,7 +90,8 @@ public class TestQueryIterSort {
@Test
public void testNoSpill()
{
- iterator.setCallback(new Callback() { public void call() { /* do nothing */ } });
+ iterator.setCallback(new Callback() { @Override
+ public void call() { /* do nothing */ } });
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
ExecutionContext executionContext = new ExecutionContext(context, (Graph)null, (DatasetGraph)null, (OpExecutorFactory)null) ;
@@ -112,7 +113,8 @@ public class TestQueryIterSort {
@Test
public void testCleanAfterClose()
{
- iterator.setCallback(new Callback() { public void call() { /* do nothing */ } });
+ iterator.setCallback(new Callback() { @Override
+ public void call() { /* do nothing */ } });
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
context.set(ARQ.spillOnDiskSortingThreshold, 10L) ;
@@ -137,7 +139,8 @@ public class TestQueryIterSort {
@Test
public void testCleanAfterExhaustion()
{
- iterator.setCallback(new Callback() { public void call() { /* do nothing */ } });
+ iterator.setCallback(new Callback() { @Override
+ public void call() { /* do nothing */ } });
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
context.set(ARQ.spillOnDiskSortingThreshold, 10L) ;
@@ -220,7 +223,8 @@ public class TestQueryIterSort {
public void testCancelInterruptsExternalSortAtStartOfIteration()
{
iterator = new CallbackIterator(unsorted.iterator(), 25, null);
- iterator.setCallback(new Callback() { public void call() { /* do nothing */ } });
+ iterator.setCallback(new Callback() { @Override
+ public void call() { /* do nothing */ } });
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
context.set(ARQ.spillOnDiskSortingThreshold, 10L) ;
@@ -297,13 +301,13 @@ public class TestQueryIterSort {
this.callback = callback ;
}
- //@Override
+ @Override
public boolean hasNext()
{
return delegate.hasNext() ;
}
- //@Override
+ @Override
public Binding next()
{
if (elementsReturned++ >= trigger)
@@ -313,7 +317,7 @@ public class TestQueryIterSort {
return delegate.next() ;
}
- //@Override
+ @Override
public void remove()
{
delegate.remove() ;
@@ -328,29 +332,29 @@ public class TestQueryIterSort {
return canceled ;
}
- //@Override
+ @Override
public Binding nextBinding()
{
if (elementsReturned++ >= trigger) callback.call() ;
return delegate.next() ;
}
- //@Override
+ @Override
@SuppressWarnings("deprecation") public void abort() { throw new ARQNotImplemented() ; }
- //@Override
+ @Override
public void cancel() { canceled = true ; }
- //@Override
+ @Override
public void close() { throw new ARQNotImplemented() ; }
- //@Override
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt) { throw new ARQNotImplemented() ; }
- //@Override
+ @Override
public String toString(PrefixMapping pmap) { throw new ARQNotImplemented() ; }
- //@Override
+ @Override
public void output(IndentedWriter out) { throw new ARQNotImplemented() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/SimpleTestRunner.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/SimpleTestRunner.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/SimpleTestRunner.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/junit/SimpleTestRunner.java Wed Oct 19 12:15:05 2011
@@ -101,6 +101,7 @@ public class SimpleTestRunner extends Ba
static class Listener implements TestListener
{
Listener() {}
+ @Override
public void addError(Test test, Throwable arg1)
{
System.out.println("** Error: "+test) ;
@@ -113,6 +114,7 @@ public class SimpleTestRunner extends Ba
}
}
+ @Override
public void addFailure(Test test, AssertionFailedError arg1)
{
System.out.println("** Failure: "+test);
@@ -125,8 +127,10 @@ public class SimpleTestRunner extends Ba
}
}
+ @Override
public void endTest(Test test) { }
+ @Override
public void startTest(Test test)
{
// Compensate for TestCase.toString() adding "(class)" to the end of the name
@@ -141,9 +145,13 @@ public class SimpleTestRunner extends Ba
static class SilentListener implements TestListener
{
SilentListener() {}
+ @Override
public void addError(Test test, Throwable arg1) {}
+ @Override
public void addFailure(Test test, AssertionFailedError arg1) {}
+ @Override
public void endTest(Test test) { }
+ @Override
public void startTest(Test test) { }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/atlas/event/TestEvent.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/atlas/event/TestEvent.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/atlas/event/TestEvent.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/atlas/event/TestEvent.java Wed Oct 19 12:15:05 2011
@@ -33,7 +33,7 @@ public class TestEvent extends BaseTest
public Object dest = null ;
public Event event = null ;
- //@Override
+ @Override
public void event(Object dest, Event event)
{
eventCount++ ;