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 13:47:53 UTC
svn commit: r1186119 [3/12] - in /incubator/jena/Jena2/jena/trunk: ./
.settings/ src/main/java/com/hp/hpl/jena/
src/main/java/com/hp/hpl/jena/assembler/assemblers/
src/main/java/com/hp/hpl/jena/datatypes/
src/main/java/com/hp/hpl/jena/datatypes/xsd/ sr...
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/ReificationWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/ReificationWrapper.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/ReificationWrapper.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/ReificationWrapper.java Wed Oct 19 11:47:05 2011
@@ -27,17 +27,21 @@ public class ReificationWrapper implemen
this.base = this.graph.getBase();
}
+ @Override
public ExtendedIterator<Node> allNodes()
{ // TODO needs constraining for :subject :object etc
return base.find( Node.ANY, RDF.Nodes.type, RDF.Nodes.Statement ).mapWith( Triple.getSubject );
}
+ @Override
public ExtendedIterator<Node> allNodes( Triple t )
{ throw new BrokenException( "this reifier operation" ); }
+ @Override
public void close()
{ /* nothing to do */ }
+ @Override
public ExtendedIterator<Triple>find( TripleMatch m )
{ return base.find( m ).filterKeep( isReificationTriple ); }
@@ -47,30 +51,38 @@ public class ReificationWrapper implemen
{ return isReificationTriple( o ); }
};
+ @Override
public ExtendedIterator<Triple> findEither( TripleMatch m, boolean showHidden )
{ return showHidden == style.conceals() ? find( m ) : Triple.None; }
+ @Override
public ExtendedIterator<Triple> findExposed( TripleMatch m )
{ return find( m ); }
+ @Override
public Graph getParentGraph()
{ return graph; }
+ @Override
public ReificationStyle getStyle()
{ return style; }
+ @Override
public boolean handledAdd( Triple t )
{
base.add( t );
return isReificationTriple( t );
}
+ @Override
public boolean handledRemove( Triple t )
{ throw new BrokenException( "this reifier operation" ); }
+ @Override
public boolean hasTriple( Node n )
{ return getTriple( n ) != null; }
+ @Override
public Node reifyAs( Node n, Triple t )
{
Triple already = getTriple( n );
@@ -94,6 +106,7 @@ public class ReificationWrapper implemen
throw new CannotReifyException( n );
}
+ @Override
public void remove( Node n, Triple t )
{ // TODO fix to ensure only works on complete reifications
base.delete( Triple.create( n, RDF.Nodes.subject, t.getSubject() ) );
@@ -102,9 +115,11 @@ public class ReificationWrapper implemen
base.delete( Triple.create( n, RDF.Nodes.type, RDF.Nodes.Statement ) );
}
+ @Override
public void remove( Triple t )
{ throw new BrokenException( "this reifier operation" ); }
+ @Override
public int size()
{ return style.conceals() ? 0: countQuadlets(); }
@@ -128,6 +143,7 @@ public class ReificationWrapper implemen
;
}
+ @Override
public boolean hasTriple( Triple t )
{ // CHECK: there's one match AND it matches the triple t.
Node X = Query.X, S = Query.S, P = Query.P, O = Query.O;
@@ -142,6 +158,7 @@ public class ReificationWrapper implemen
( domain.getElement(1), domain.getElement(2), domain.getElement(3) );
}
+ @Override
public Triple getTriple( Node n )
{
Node S = Query.S, P = Query.P, O = Query.O;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleBulkUpdateHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleBulkUpdateHandler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleBulkUpdateHandler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleBulkUpdateHandler.java Wed Oct 19 11:47:05 2011
@@ -34,12 +34,14 @@ public class SimpleBulkUpdateHandler imp
this.manager = graph.getEventManager();
}
+ @Override
public void add( Triple [] triples )
{
for (int i = 0; i < triples.length; i += 1) graph.performAdd( triples[i] );
manager.notifyAddArray( graph, triples );
}
+ @Override
public void add( List<Triple> triples )
{ add( triples, true ); }
@@ -49,6 +51,7 @@ public class SimpleBulkUpdateHandler imp
if (notify) manager.notifyAddList( graph, triples );
}
+ @Override
public void add( Iterator<Triple> it )
{ addIterator( it, true ); }
@@ -59,9 +62,11 @@ public class SimpleBulkUpdateHandler imp
if (notify) manager.notifyAddIterator( graph, s );
}
+ @Override
public void add( Graph g )
{ add( g, false ); }
+ @Override
public void add( Graph g, boolean withReifications )
{
addIterator( GraphUtil.findAll( g ), false );
@@ -91,12 +96,14 @@ public class SimpleBulkUpdateHandler imp
}
}
+ @Override
public void delete( Triple [] triples )
{
for (int i = 0; i < triples.length; i += 1) graph.performDelete( triples[i] );
manager.notifyDeleteArray( graph, triples );
}
+ @Override
public void delete( List<Triple> triples )
{ delete( triples, true ); }
@@ -106,6 +113,7 @@ public class SimpleBulkUpdateHandler imp
if (notify) manager.notifyDeleteList( graph, triples );
}
+ @Override
public void delete( Iterator<Triple> it )
{ deleteIterator( it, true ); }
@@ -124,9 +132,11 @@ public class SimpleBulkUpdateHandler imp
return L;
}
+ @Override
public void delete( Graph g )
{ delete( g, false ); }
+ @Override
public void delete( Graph g, boolean withReifications )
{
if (g.dependsOn( graph ))
@@ -137,6 +147,7 @@ public class SimpleBulkUpdateHandler imp
manager.notifyDeleteGraph( graph, g );
}
+ @Override
public void removeAll()
{ removeAll( graph );
notifyRemoveAll(); }
@@ -144,6 +155,7 @@ public class SimpleBulkUpdateHandler imp
protected void notifyRemoveAll()
{ manager.notifyEvent( graph, GraphEvents.removeAll ); }
+ @Override
public void remove( Node s, Node p, Node o )
{ removeAll( graph, s, p, o );
manager.notifyEvent( graph, GraphEvents.remove( s, p, o ) ); }
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleEventManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleEventManager.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleEventManager.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleEventManager.java Wed Oct 19 11:47:05 2011
@@ -58,87 +58,103 @@ public class SimpleEventManager implemen
*/
}
+ @Override
public GraphEventManager register( GraphListener listener )
{
listeners.add( listener );
return this;
}
+ @Override
public GraphEventManager unregister( GraphListener listener )
{
listeners.remove( listener );
return this;
}
+ @Override
public boolean listening()
{ return listeners.size() > 0; }
+ @Override
public void notifyAddTriple( Graph g, Triple t )
{
for (GraphListener l:listeners)
l.notifyAddTriple( g, t );
}
+ @Override
public void notifyAddArray( Graph g, Triple [] ts )
{
for (GraphListener l:listeners)
l.notifyAddArray( g, ts );
}
+ @Override
public void notifyAddList( Graph g, List<Triple> L )
{
for (GraphListener l:listeners)
l.notifyAddList( g, L);
}
+ @Override
public void notifyAddIterator( Graph g, List<Triple> it )
{
for (GraphListener l:listeners)
l.notifyAddIterator( g, it.iterator() );
}
+ @Override
public void notifyAddIterator( Graph g, Iterator<Triple> it )
{ notifyAddIterator( g, IteratorCollection.iteratorToList( it ) ); }
+ @Override
public void notifyAddGraph( Graph g, Graph added )
{
for (GraphListener l:listeners)
l.notifyAddGraph( g, added );
}
+ @Override
public void notifyDeleteTriple( Graph g, Triple t )
{
for (GraphListener l:listeners)
l.notifyDeleteTriple( g, t );
}
+ @Override
public void notifyDeleteArray( Graph g, Triple [] ts )
{
for (GraphListener l:listeners)
l.notifyDeleteArray( g, ts );
}
+ @Override
public void notifyDeleteList( Graph g, List<Triple> L )
{
for (GraphListener l:listeners)
l.notifyDeleteList( g, L );
}
+ @Override
public void notifyDeleteIterator( Graph g, List<Triple> L )
{
for (GraphListener l:listeners)
l.notifyDeleteIterator( g, L.iterator() );
}
+ @Override
public void notifyDeleteIterator( Graph g, Iterator<Triple> it )
{ notifyDeleteIterator( g, IteratorCollection.iteratorToList( it ) ); }
+ @Override
public void notifyDeleteGraph( Graph g, Graph removed )
{
for (GraphListener l:listeners)
l.notifyDeleteGraph( g, removed );
}
+ @Override
public void notifyEvent( Graph source, Object event )
{
for (GraphListener l:listeners)
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleGraphMaker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleGraphMaker.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleGraphMaker.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleGraphMaker.java Wed Oct 19 11:47:05 2011
@@ -46,6 +46,7 @@ public class SimpleGraphMaker extends Ba
/**
Create a graph and record it with the given name in the local map.
*/
+ @Override
public Graph createGraph( String name, boolean strict )
{
GraphMemBase already = (GraphMemBase) graphs.get( name );
@@ -64,6 +65,7 @@ public class SimpleGraphMaker extends Ba
/**
Open (aka find) a graph with the given name in the local map.
*/
+ @Override
public Graph openGraph( String name, boolean strict )
{
GraphMemBase already = (GraphMemBase) graphs.get( name );
@@ -81,6 +83,7 @@ public class SimpleGraphMaker extends Ba
/**
Remove the mapping from name to any graph from the local map.
*/
+ @Override
public void removeGraph( String name )
{
if (!graphs.containsKey( name )) throw new DoesNotExistException( name );
@@ -90,15 +93,18 @@ public class SimpleGraphMaker extends Ba
/**
Return true iff we have a graph with the given name
*/
+ @Override
public boolean hasGraph( String name )
{ return graphs.containsKey( name ); }
/**
Close this factory - we choose to do nothing.
*/
+ @Override
public void close()
{ /* nothing to do */ }
+ @Override
public ExtendedIterator<String> listGraphs()
{ return WrappedIterator.create( graphs.keySet().iterator() ); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifier.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifier.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifier.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifier.java Wed Oct 19 11:47:05 2011
@@ -51,25 +51,31 @@ public class SimpleReifier implements Re
this.style = style;
}
+ @Override
public ReificationStyle getStyle()
{ return style; }
/** return the parent graph we are bound to */
+ @Override
public Graph getParentGraph()
{ return parent; }
/** return the triple bound to _n_ */
+ @Override
public Triple getTriple( Node n )
{ return tripleMap.getTriple( n ); }
/** true iff there is a triple bound to _n_ */
+ @Override
public boolean hasTriple( Node n )
{ return getTriple( n ) != null; }
/** */
+ @Override
public ExtendedIterator<Node> allNodes()
{ return tripleMap.tagIterator(); }
+ @Override
public ExtendedIterator<Node> allNodes( Triple t )
{ return tripleMap.tagIterator( t ); }
@@ -83,6 +89,7 @@ public class SimpleReifier implements Re
reifiy <code>toReify</code> with tag <code>tag</code>. If a different triple is
already reified under <code>tag</code>, throw an AlreadyReifiedException.
*/
+ @Override
public Node reifyAs( Node tag, Triple toReify )
{
Triple existing = tripleMap.getTriple( tag );
@@ -115,6 +122,7 @@ public class SimpleReifier implements Re
If n is bound to the triple t, remove that triple. If we're not concealing reification
quadlets, we need to remove them from the parent graph too.
*/
+ @Override
public void remove( Node n, Triple t )
{
Triple x = tripleMap.getTriple( n );
@@ -123,12 +131,15 @@ public class SimpleReifier implements Re
if (!concealing) parentRemoveQuad( n, t ); }
}
+ @Override
public void remove( Triple t )
{ tripleMap.removeTriple( t ); }
+ @Override
public boolean hasTriple( Triple t )
{ return tripleMap.hasTriple( t ); }
+ @Override
public boolean handledAdd( Triple fragment )
{
if (intercepting)
@@ -174,6 +185,7 @@ public class SimpleReifier implements Re
if (t != null) tripleMap.putTriple( tag, t );
}
+ @Override
public boolean handledRemove( Triple fragment )
{
if (intercepting)
@@ -206,6 +218,7 @@ public class SimpleReifier implements Re
tripleMap.putTriple( tag, complete );
}
+ @Override
public ExtendedIterator<Triple> find( TripleMatch m )
{
return matchesReification( m )
@@ -231,12 +244,15 @@ public class SimpleReifier implements Re
private boolean matchesStatement( Node x )
{ return !x.isConcrete() || x.equals( RDF.Nodes.Statement ); }
+ @Override
public ExtendedIterator<Triple> findExposed( TripleMatch m )
{ return findEither( m, false ); }
+ @Override
public ExtendedIterator<Triple> findEither( TripleMatch m, boolean showHidden )
{ return showHidden == concealing ? find( m ) : Triple.None; }
+ @Override
public int size()
{ return concealing ? 0 : tripleMap.size() + fragmentsMap.size(); }
@@ -271,6 +287,7 @@ public class SimpleReifier implements Re
/**
Close this reifier - discard (big) resources.
*/
+ @Override
public void close()
{
fragmentsMap = null;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentHandler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentHandler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentHandler.java Wed Oct 19 11:47:05 2011
@@ -18,6 +18,7 @@ public abstract class SimpleReifierFragm
public abstract boolean clashesWith( ReifierFragmentsMap map, Node fragmentObject, Triple reified );
+ @Override
public boolean clashedWith( Node tag, Node fragmentObject, Triple reified )
{
if (clashesWith( map, fragmentObject, reified ))
@@ -29,6 +30,7 @@ public abstract class SimpleReifierFragm
return false;
}
+ @Override
public Triple reifyIfCompleteQuad( Triple fragment, Node tag, Node object )
{
return map.reifyCompleteQuad( this, fragment, tag, object );
@@ -40,6 +42,7 @@ public abstract class SimpleReifierFragm
* @param fragment
* @return
*/
+ @Override
public Triple removeFragment( Node tag, Triple already, Triple fragment )
{
return map.removeFragment( this, tag, already, fragment );
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentsMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentsMap.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentsMap.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierFragmentsMap.java Wed Oct 19 11:47:05 2011
@@ -28,6 +28,7 @@ public class SimpleReifierFragmentsMap i
protected void removeFragments( Node key )
{ forwardMap.remove( key ); }
+ @Override
public void clear()
{ forwardMap.clear(); }
@@ -78,9 +79,11 @@ public class SimpleReifierFragmentsMap i
return WrappedIterator.create( L.iterator() );
}
+ @Override
public ExtendedIterator<Triple> find( TripleMatch m )
{ return allTriples( m ); }
+ @Override
public int size()
{
int result = 0;
@@ -97,6 +100,7 @@ public class SimpleReifierFragmentsMap i
given a triple t, see if it's a reification triple and if so return the internal selector;
otherwise return null.
*/
+ @Override
public ReifierFragmentHandler getFragmentHandler( Triple t )
{
Node p = t.getPredicate();
@@ -149,20 +153,25 @@ public class SimpleReifierFragmentsMap i
protected Fragments explode( Node s, Triple t )
{ return putFragments( s, new Fragments( s, t ) ); }
+ @Override
public boolean hasFragments( Node tag )
{ return getFragments( tag ) != null; }
protected static final Fragments.GetSlot TYPES_index = new Fragments.GetSlot()
- { public Set<Node> get( Fragments f ) { return f.types; } };
+ { @Override
+ public Set<Node> get( Fragments f ) { return f.types; } };
protected static final Fragments.GetSlot SUBJECTS_index =
- new Fragments.GetSlot() { public Set<Node> get( Fragments f ) { return f.subjects; } };
+ new Fragments.GetSlot() { @Override
+ public Set<Node> get( Fragments f ) { return f.subjects; } };
protected static final Fragments.GetSlot OBJECTS_index =
- new Fragments.GetSlot() { public Set<Node> get( Fragments f ) { return f.objects; } };
+ new Fragments.GetSlot() { @Override
+ public Set<Node> get( Fragments f ) { return f.objects; } };
protected static final Fragments.GetSlot PREDICATES_index =
- new Fragments.GetSlot() { public Set<Node> get( Fragments f ) { return f.predicates; } };
+ new Fragments.GetSlot() { @Override
+ public Set<Node> get( Fragments f ) { return f.predicates; } };
protected final ReifierFragmentHandler TYPES = new SimpleReifierFragmentHandler( this, TYPES_index)
{ @Override public boolean clashesWith( ReifierFragmentsMap map, Node n, Triple reified ) { return false; } };
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierTripleMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierTripleMap.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierTripleMap.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleReifierTripleMap.java Wed Oct 19 11:47:05 2011
@@ -22,9 +22,11 @@ public class SimpleReifierTripleMap impl
protected Map<Node, Triple> forwardMap = CollectionFactory.createHashedMap();
+ @Override
public Triple getTriple( Node tag )
{ return forwardMap.get( tag ); }
+ @Override
public void clear()
{
forwardMap.clear();
@@ -33,9 +35,11 @@ public class SimpleReifierTripleMap impl
/**
Answer true iff we have a reified triple <code>t</code>.
*/
+ @Override
public boolean hasTriple( Triple t )
{ return inverseMap.containsKey( t ); }
+ @Override
public Triple putTriple( Node key, Triple value )
{
forwardMap.put( key, value );
@@ -43,6 +47,7 @@ public class SimpleReifierTripleMap impl
return value;
}
+ @Override
public void removeTriple( Node key )
{
Object t = forwardMap.get( key );
@@ -50,12 +55,14 @@ public class SimpleReifierTripleMap impl
if (t instanceof Triple) inverseRemove( (Triple) t, key );
}
+ @Override
public void removeTriple( Node key, Triple value )
{
forwardMap.remove( key );
inverseRemove( value, key );
}
+ @Override
public void removeTriple( Triple t )
{
ExtendedIterator<Node> it = tagIterator( t );
@@ -82,6 +89,7 @@ public class SimpleReifierTripleMap impl
s.add( key );
}
+ @Override
public ExtendedIterator<Node> tagIterator( Triple t )
{
Set<Node> s = inverseMap.get( t );
@@ -135,15 +143,18 @@ public class SimpleReifierTripleMap impl
{ @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch tm ) { return allTriples( tm ); } };
}
+ @Override
public ExtendedIterator<Triple> find( TripleMatch m )
{ return allTriples( m ); }
+ @Override
public int size()
{ return forwardMap.size() * 4; }
/**
Answer an iterator over all the fragment tags in this map.
*/
+ @Override
public ExtendedIterator<Node> tagIterator()
{ return WrappedIterator.create( forwardMap.keySet().iterator() ); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleTransactionHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleTransactionHandler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleTransactionHandler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/SimpleTransactionHandler.java Wed Oct 19 11:47:05 2011
@@ -14,15 +14,19 @@ public class SimpleTransactionHandler ex
public SimpleTransactionHandler()
{ super(); }
+ @Override
public boolean transactionsSupported()
{ return false; }
+ @Override
public void begin()
{ notSupported(); }
+ @Override
public void abort()
{ notSupported(); }
+ @Override
public void commit()
{ notSupported(); }
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/TransactionHandlerBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/TransactionHandlerBase.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/TransactionHandlerBase.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/TransactionHandlerBase.java Wed Oct 19 11:47:05 2011
@@ -25,6 +25,7 @@ public abstract class TransactionHandler
completes normally, commit the transaction and return the result.
Otherwise abort the transaction and throw a wrapped exception.
*/
+ @Override
public Object executeInTransaction( Command c )
{
begin();
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedBulkUpdateHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedBulkUpdateHandler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedBulkUpdateHandler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedBulkUpdateHandler.java Wed Oct 19 11:47:05 2011
@@ -31,18 +31,21 @@ public class WrappedBulkUpdateHandler im
this.manager = graph.getEventManager();
}
+ @Override
public void add( Triple [] triples )
{
base.add( triples );
manager.notifyAddArray( graph, triples );
}
+ @Override
public void add( List<Triple> triples )
{
base.add( triples );
manager.notifyAddList( graph, triples );
}
+ @Override
public void add( Iterator<Triple> it )
{
List<Triple> s = IteratorCollection.iteratorToList( it );
@@ -50,30 +53,35 @@ public class WrappedBulkUpdateHandler im
manager.notifyAddIterator( graph, s );
}
+ @Override
public void add( Graph g, boolean withReifications )
{
base.add( g, withReifications );
manager.notifyAddGraph( graph, g );
}
+ @Override
public void add( Graph g )
{
base.add( g );
manager.notifyAddGraph( graph, g );
}
+ @Override
public void delete( Triple[] triples )
{
base.delete( triples );
manager.notifyDeleteArray( graph, triples );
}
+ @Override
public void delete( List<Triple> triples )
{
base.delete( triples );
manager.notifyDeleteList( graph, triples );
}
+ @Override
public void delete( Iterator<Triple> it )
{
List<Triple> s = IteratorCollection.iteratorToList( it );
@@ -81,24 +89,28 @@ public class WrappedBulkUpdateHandler im
manager.notifyDeleteIterator( graph, s );
}
+ @Override
public void delete( Graph g )
{
base.delete( g );
manager.notifyDeleteGraph( graph, g );
}
+ @Override
public void delete( Graph g, boolean withReifications )
{
base.delete( g, withReifications );
manager.notifyDeleteGraph( graph, g );
}
+ @Override
public void removeAll()
{
base.removeAll();
manager.notifyEvent( graph, GraphEvents.removeAll );
}
+ @Override
public void remove( Node s, Node p, Node o )
{
base.remove( s, p, o );
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedGraph.java Wed Oct 19 11:47:05 2011
@@ -26,77 +26,99 @@ public class WrappedGraph implements Gra
{ this.base = base;
this.reifier = new WrappedReifier( base.getReifier(), this ); }
+ @Override
public boolean dependsOn( Graph other )
{ return base.dependsOn( other ); }
+ @Override
public QueryHandler queryHandler()
{ return base.queryHandler(); }
+ @Override
public TransactionHandler getTransactionHandler()
{ return base.getTransactionHandler(); }
+ @Override
public BulkUpdateHandler getBulkUpdateHandler()
{
if (bud == null) bud = new WrappedBulkUpdateHandler( this, base.getBulkUpdateHandler() );
return bud;
}
+ @Override
public GraphStatisticsHandler getStatisticsHandler()
{ return base.getStatisticsHandler(); }
+ @Override
public Capabilities getCapabilities()
{ return base.getCapabilities(); }
+ @Override
public GraphEventManager getEventManager()
{
if (gem == null) gem = new SimpleEventManager( this );
return gem;
}
+ @Override
public Reifier getReifier()
{return reifier; }
+ @Override
public PrefixMapping getPrefixMapping()
{ return base.getPrefixMapping(); }
+ @Override
public void add( Triple t )
{ base.add( t );
getEventManager().notifyAddTriple( this, t ); }
+ @Override
public void delete( Triple t )
{ base.delete( t );
getEventManager().notifyDeleteTriple( this, t ); }
+ @Override
public ExtendedIterator<Triple> find( TripleMatch m )
{ return SimpleEventManager.notifyingRemove( this, base.find( m ) ); }
+ @Override
public ExtendedIterator<Triple> find( Node s, Node p, Node o )
{ return SimpleEventManager.notifyingRemove( this, base.find( s, p, o ) ); }
+ @Override
public boolean isIsomorphicWith( Graph g )
{ return base.isIsomorphicWith( g ); }
+ @Override
public boolean contains( Node s, Node p, Node o )
{ return base.contains( s, p, o ); }
+ @Override
public boolean contains( Triple t )
{ return base.contains( t ); }
+ @Override
public void close()
{ base.close(); }
+ @Override
public boolean isClosed()
{ return base.isClosed(); }
+ @Override
public boolean isEmpty()
{ return base.isEmpty(); }
+ @Override
public int size()
{ return base.size(); }
+ @Override
public void performAdd(Triple t)
{ base.add( t ); }
+ @Override
public void performDelete(Triple t)
{ base.delete( t ); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedReifier.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedReifier.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedReifier.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/impl/WrappedReifier.java Wed Oct 19 11:47:05 2011
@@ -28,72 +28,89 @@ public class WrappedReifier implements R
/**
@see com.hp.hpl.jena.graph.Reifier#getStyle()
*/
- public ReificationStyle getStyle() { return base.getStyle(); }
+ @Override
+ public ReificationStyle getStyle() { return base.getStyle(); }
/**
@see com.hp.hpl.jena.graph.Reifier#getParentGraph()
*/
- public Graph getParentGraph() { return parent; }
+ @Override
+ public Graph getParentGraph() { return parent; }
+ @Override
public ExtendedIterator<Triple> find( TripleMatch m ) { return base.find( m ); }
+ @Override
public ExtendedIterator<Triple> findExposed( TripleMatch m ) { return base.findExposed( m ); }
+ @Override
public ExtendedIterator<Triple> findEither( TripleMatch m, boolean showHidden )
{ return base.findEither( m, showHidden ); }
+ @Override
public int size() { return base.size(); }
/**
@see com.hp.hpl.jena.graph.Reifier#reifyAs(com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Triple)
*/
- public Node reifyAs( Node n, Triple t ) { return base.reifyAs( n, t ); }
+ @Override
+ public Node reifyAs( Node n, Triple t ) { return base.reifyAs( n, t ); }
/**
@see com.hp.hpl.jena.graph.Reifier#hasTriple(com.hp.hpl.jena.graph.Node)
*/
- public boolean hasTriple( Node n ) { return base.hasTriple( n ); }
+ @Override
+ public boolean hasTriple( Node n ) { return base.hasTriple( n ); }
/**
@see com.hp.hpl.jena.graph.Reifier#hasTriple(com.hp.hpl.jena.graph.Triple)
*/
- public boolean hasTriple( Triple t ) { return base.hasTriple( t ); }
+ @Override
+ public boolean hasTriple( Triple t ) { return base.hasTriple( t ); }
/**
@see com.hp.hpl.jena.graph.Reifier#allNodes()
*/
- public ExtendedIterator<Node> allNodes() { return base.allNodes(); }
+ @Override
+ public ExtendedIterator<Node> allNodes() { return base.allNodes(); }
/**
@see com.hp.hpl.jena.graph.Reifier#allNodes(com.hp.hpl.jena.graph.Triple)
*/
- public ExtendedIterator<Node> allNodes( Triple t ) { return base.allNodes( t ); }
+ @Override
+ public ExtendedIterator<Node> allNodes( Triple t ) { return base.allNodes( t ); }
/**
@see com.hp.hpl.jena.graph.Reifier#remove(com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Triple)
*/
- public void remove( Node n, Triple t ) { base.remove( n, t ); }
+ @Override
+ public void remove( Node n, Triple t ) { base.remove( n, t ); }
/**
@see com.hp.hpl.jena.graph.Reifier#remove(com.hp.hpl.jena.graph.Triple)
*/
- public void remove( Triple t ) { base.remove( t ); }
+ @Override
+ public void remove( Triple t ) { base.remove( t ); }
/**
@see com.hp.hpl.jena.graph.Reifier#handledAdd(com.hp.hpl.jena.graph.Triple)
*/
- public boolean handledAdd( Triple t ) { return base.handledAdd( t ); }
+ @Override
+ public boolean handledAdd( Triple t ) { return base.handledAdd( t ); }
/**
@see com.hp.hpl.jena.graph.Reifier#handledRemove(com.hp.hpl.jena.graph.Triple)
*/
- public boolean handledRemove( Triple t ) { return base.handledRemove( t ); }
+ @Override
+ public boolean handledRemove( Triple t ) { return base.handledRemove( t ); }
/**
@see com.hp.hpl.jena.graph.GetTriple#getTriple(com.hp.hpl.jena.graph.Node)
*/
- public Triple getTriple( Node n ) { return base.getTriple( n ); }
+ @Override
+ public Triple getTriple( Node n ) { return base.getTriple( n ); }
/**
@see com.hp.hpl.jena.graph.Reifier#close()
*/
+ @Override
public void close() { base.close(); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/BufferPipe.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/BufferPipe.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/BufferPipe.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/BufferPipe.java Wed Oct 19 11:47:05 2011
@@ -53,15 +53,19 @@ public class BufferPipe implements Pipe
catch (Exception e) { throw new BoundedBufferPutException( e ); }
}
+ @Override
public void put( Domain d )
{ putAny( d ); }
+ @Override
public void close()
{ putAny( finished ); }
+ @Override
public void close( Exception e )
{ putAny( new Finished( e ) ); }
+ @Override
public boolean hasNext()
{
if (open)
@@ -90,6 +94,7 @@ public class BufferPipe implements Pipe
return false;
}
+ @Override
public Domain get()
{
if (hasNext() == false) throw new NoSuchElementException();
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Dyadic.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Dyadic.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Dyadic.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Dyadic.java Wed Oct 19 11:47:05 2011
@@ -61,16 +61,19 @@ public abstract class Dyadic extends App
throw new JenaException( "not Boolean: " + x );
}
+ @Override
public Valuator prepare( VariableIndexes vi )
{
final Valuator l = L.prepare( vi ), r = R.prepare( vi );
return new Valuator()
{
+ @Override
public boolean evalBool( IndexValues iv)
{
return ((Boolean) evalObject( iv )).booleanValue();
}
+ @Override
public Object evalObject( IndexValues iv )
{
return Dyadic.this.evalObject( l.evalObject( iv ), r.evalObject( iv ) );
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Expression.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Expression.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Expression.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Expression.java Wed Oct 19 11:47:05 2011
@@ -99,13 +99,21 @@ public interface Expression
*/
public static abstract class Base implements Expression
{
+ @Override
public boolean isVariable() { return false; }
+ @Override
public boolean isApply() { return false; }
+ @Override
public boolean isConstant() { return false; }
+ @Override
public String getName() { return null; }
+ @Override
public Object getValue() { return null; }
+ @Override
public int argCount() { return 0; }
+ @Override
public String getFun() { return null; }
+ @Override
public Expression getArg( int i ) { return null; }
@Override
@@ -139,6 +147,7 @@ public interface Expression
public Object getValue()
{ return value; }
+ @Override
public Valuator prepare( VariableIndexes vi )
{ return new FixedValuator( value ); }
@@ -257,6 +266,7 @@ public interface Expression
public Valof( VariableIndexes map ) { this.map = map; }
+ @Override
public final Object get( String name )
{ return dom.get( map.indexOf( name ) ); }
@@ -275,9 +285,12 @@ public interface Expression
// TODO when moving to Jave 1.4 can use Boolean.valueOf( value )
@Override
public Object getValue() { return value ? Boolean.TRUE : Boolean.FALSE; }
+ @Override
public Valuator prepare( VariableIndexes vi ) { return this; }
public boolean evalBool( VariableValues vv ) { return value; }
+ @Override
public boolean evalBool( IndexValues vv ) { return value; }
+ @Override
public Object evalObject( IndexValues iv ) { return getValue(); }
}
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/FixedValuator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/FixedValuator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/FixedValuator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/FixedValuator.java Wed Oct 19 11:47:05 2011
@@ -27,13 +27,15 @@ public class FixedValuator implements Va
object, as a <code>boolean</code>. The index values
are irrelevant.
*/
- public boolean evalBool( IndexValues iv )
+ @Override
+ public boolean evalBool( IndexValues iv )
{ return ((Boolean) evalObject( iv )).booleanValue(); }
/**
Answer this FixedValuator's value, as supplied when it was constructed.
*/
- public Object evalObject( IndexValues iv )
+ @Override
+ public Object evalObject( IndexValues iv )
{ return value; }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Mapping.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Mapping.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Mapping.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/Mapping.java Wed Oct 19 11:47:05 2011
@@ -54,6 +54,7 @@ public class Mapping implements Variable
return res;
}
+ @Override
public int indexOf( String name )
{ return indexOf( Node.createVariable( name ) ); }
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/PatternStageCompiler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/PatternStageCompiler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/PatternStageCompiler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/PatternStageCompiler.java Wed Oct 19 11:47:05 2011
@@ -64,15 +64,19 @@ public final class PatternStageCompiler
/*
satisfy the interface
*/
+ @Override
public Element fixed( Node value )
{ return new Fixed( value ); }
+ @Override
public Element bound( Node n, int index )
{ return new Bound( index ); }
+ @Override
public Element bind( Node n, int index )
{ return new Bind( index ); }
+ @Override
public Element any()
{ return Element.ANY; }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/QueryNodeFactoryBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/QueryNodeFactoryBase.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/QueryNodeFactoryBase.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/QueryNodeFactoryBase.java Wed Oct 19 11:47:05 2011
@@ -20,24 +20,31 @@ import com.hp.hpl.jena.graph.query.Query
*/
public class QueryNodeFactoryBase implements QueryNodeFactory
{
+ @Override
public QueryNode createAny()
{ return new Any(); }
+ @Override
public QueryNode createFixed( Node n )
{ return new Fixed( n ); }
+ @Override
public QueryNode createBind( Node node, int i )
{ return new Bind( node, i ); }
+ @Override
public QueryNode createJustBound( Node node, int i )
{ return new JustBound( node, i ); }
+ @Override
public QueryNode createBound( Node node, int i )
{ return new Bound( node, i ); }
+ @Override
public QueryTriple createTriple( QueryNode S, QueryNode P, QueryNode O )
{ return new QueryTriple( S, P, O ); }
+ @Override
public QueryTriple [] createArray( int size )
{ return new QueryTriple [size]; }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryHandler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryHandler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryHandler.java Wed Oct 19 11:47:05 2011
@@ -28,21 +28,27 @@ public class SimpleQueryHandler implemen
public SimpleQueryHandler( Graph graph )
{ this.graph = graph; }
+ @Override
public Stage patternStage( Mapping map, ExpressionSet constraints, Triple [] t )
{ return new PatternStage( graph, map, constraints, t ); }
+ @Override
public BindingQueryPlan prepareBindings( Query q, Node [] variables )
{ return new SimpleQueryPlan( graph, q, variables ); }
+ @Override
public TreeQueryPlan prepareTree( Graph pattern )
{ return new SimpleTreeQueryPlan( graph, pattern ); }
- public ExtendedIterator<Node> objectsFor( Node s, Node p )
+ @Override
+ public ExtendedIterator<Node> objectsFor( Node s, Node p )
{ return objectsFor( graph, s, p ); }
- public ExtendedIterator<Node> subjectsFor( Node p, Node o )
+ @Override
+ public ExtendedIterator<Node> subjectsFor( Node p, Node o )
{ return subjectsFor( graph, p, o ); }
+ @Override
public ExtendedIterator<Node> predicatesFor( Node s, Node o )
{ return predicatesFor( graph, s, o ); }
@@ -75,6 +81,7 @@ public class SimpleQueryHandler implemen
up to three times to locate the node. Almost certainly particular graphs
will be able to offer better query-handlers ...
*/
+ @Override
public boolean containsNode( Node n )
{
return
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryPlan.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryPlan.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryPlan.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleQueryPlan.java Wed Oct 19 11:47:05 2011
@@ -30,6 +30,7 @@ public class SimpleQueryPlan implements
this.variables = variables;
}
+ @Override
public ExtendedIterator<Domain> executeBindings()
// { return query.executeBindings( graph, variables ); }
{
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTreeQueryPlan.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTreeQueryPlan.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTreeQueryPlan.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTreeQueryPlan.java Wed Oct 19 11:47:05 2011
@@ -26,7 +26,8 @@ public class SimpleTreeQueryPlan impleme
this.pattern = pattern;
}
- public Graph executeTree()
+ @Override
+ public Graph executeTree()
{
Graph result = Factory.createGraphMem();
Set<Node> roots = getRoots( pattern );
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTripleSorter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTripleSorter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTripleSorter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SimpleTripleSorter.java Wed Oct 19 11:47:05 2011
@@ -48,6 +48,7 @@ public class SimpleTripleSorter implemen
a new permuted copy of the original array. The work is done by a new instance
of SimpleTripleSorter specialised to this triple array (and with helpful state).
*/
+ @Override
public Triple [] sort( Triple[] ts )
{ return new SimpleTripleSorter( ts ) .sort(); }
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SlotValuator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SlotValuator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SlotValuator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/SlotValuator.java Wed Oct 19 11:47:05 2011
@@ -30,7 +30,8 @@ public class SlotValuator implements Val
Answer the value of the <code>index</code>th element of the
index values bindings.
*/
- public Object evalObject( IndexValues iv )
+ @Override
+ public Object evalObject( IndexValues iv )
{ return iv.get( index ); }
/**
@@ -38,7 +39,8 @@ public class SlotValuator implements Val
element of the index value bindings, which must be a
<code>Boolean</code> value.
*/
- public boolean evalBool( IndexValues iv )
+ @Override
+ public boolean evalBool( IndexValues iv )
{ return ((Boolean) evalObject( iv )).booleanValue(); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/TripleSorter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/TripleSorter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/TripleSorter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/TripleSorter.java Wed Oct 19 11:47:05 2011
@@ -28,7 +28,8 @@ public interface TripleSorter
A TripleSorter that does not alter the triple array at all.
*/
public static final TripleSorter dontSort = new TripleSorter()
- { public Triple [] sort( Triple [] ts ) { return ts; } };
+ { @Override
+ public Triple [] sort( Triple [] ts ) { return ts; } };
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/regexptrees/SimpleGenerator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/regexptrees/SimpleGenerator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/regexptrees/SimpleGenerator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/graph/query/regexptrees/SimpleGenerator.java Wed Oct 19 11:47:05 2011
@@ -14,25 +14,38 @@ import java.util.List;
*/
public class SimpleGenerator implements RegexpTreeGenerator
{
+ @Override
public RegexpTree getAnySingle() { return RegexpTree.ANY; }
+ @Override
public RegexpTree getStartOfLine() { return RegexpTree.SOL; }
+ @Override
public RegexpTree getEndOfLine() { return RegexpTree.EOL; }
+ @Override
public RegexpTree getNothing() { return RegexpTree.NON; }
+ @Override
public RegexpTree getText( char ch ) { return Text.create( ch ); }
+ @Override
public RegexpTree getZeroOrMore( RegexpTree d ) { return new ZeroOrMore( d ); }
+ @Override
public RegexpTree getOneOrMore( RegexpTree d ) { return new OneOrMore( d ); }
+ @Override
public RegexpTree getOptional( RegexpTree d ) { return new Optional( d ); }
+ @Override
public RegexpTree getSequence( List<? extends RegexpTree> operands ) { return Sequence.create( operands ); }
+ @Override
public RegexpTree getAlternatives( List<? extends RegexpTree> operands ) { return Alternatives.create( operands ); }
+ @Override
public RegexpTree getBackReference( int n ) { return new BackReference( n ); }
+ @Override
public RegexpTree getClass( String chars, boolean reject )
{ return reject ? (RegexpTree) new NoneOf( chars ) : new AnyOf( chars ); }
+ @Override
public RegexpTree getParen( RegexpTree operand, int index )
{ return new Paren( operand, index ); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/ArrayBunch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/ArrayBunch.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/ArrayBunch.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/ArrayBunch.java Wed Oct 19 11:47:05 2011
@@ -29,6 +29,7 @@ public class ArrayBunch implements Tripl
public ArrayBunch()
{ elements = new Triple[5]; }
+ @Override
public boolean containsBySameValueAs( Triple t )
{
int i = size;
@@ -36,6 +37,7 @@ public class ArrayBunch implements Tripl
return false;
}
+ @Override
public boolean contains( Triple t )
{
int i = size;
@@ -43,9 +45,11 @@ public class ArrayBunch implements Tripl
return false;
}
+ @Override
public int size()
{ return size; }
+ @Override
public void add( Triple t )
{
if (size == elements.length) grow();
@@ -66,6 +70,7 @@ public class ArrayBunch implements Tripl
elements = newElements;
}
+ @Override
public void remove( Triple t )
{
changes += 1;
@@ -77,6 +82,7 @@ public class ArrayBunch implements Tripl
}
}
+ @Override
public void app( Domain d, StageElement next, MatchOrBind s )
{
int i = size, initialChanges = changes;
@@ -87,11 +93,14 @@ public class ArrayBunch implements Tripl
}
}
+ @Override
public ExtendedIterator<Triple> iterator()
{
- return iterator( new HashCommon.NotifyEmpty() { public void emptied() {} } );
+ return iterator( new HashCommon.NotifyEmpty() { @Override
+ public void emptied() {} } );
}
+ @Override
public ExtendedIterator<Triple> iterator( final HashCommon.NotifyEmpty container )
{
// System.err.println( ">> ArrayBunch::iterator: intial state" );
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/GraphTripleStoreBase.java Wed Oct 19 11:47:05 2011
@@ -36,13 +36,15 @@ public abstract class GraphTripleStoreBa
/**
Destroy this triple store - discard the indexes.
*/
- public void close()
+ @Override
+ public void close()
{ subjects = predicates = objects = null; }
/**
Add a triple to this triple store.
*/
- public void add( Triple t )
+ @Override
+ public void add( Triple t )
{
if (subjects.add( t ))
{
@@ -54,7 +56,8 @@ public abstract class GraphTripleStoreBa
/**
Remove a triple from this triple store.
*/
- public void delete( Triple t )
+ @Override
+ public void delete( Triple t )
{
if (subjects.remove( t ))
{
@@ -66,7 +69,8 @@ public abstract class GraphTripleStoreBa
/**
Clear this store, ie remove all triples from it.
*/
- public void clear()
+ @Override
+ public void clear()
{
subjects.clear();
predicates.clear();
@@ -76,28 +80,34 @@ public abstract class GraphTripleStoreBa
/**
Answer the size (number of triples) of this triple store.
*/
- public int size()
+ @Override
+ public int size()
{ return subjects.size(); }
/**
Answer true iff this triple store is empty.
*/
- public boolean isEmpty()
+ @Override
+ public boolean isEmpty()
{ return subjects.isEmpty(); }
- public ExtendedIterator<Node> listSubjects()
+ @Override
+ public ExtendedIterator<Node> listSubjects()
{ return expectOnlyNodes( subjects.domain() ); }
- public ExtendedIterator<Node> listPredicates()
+ @Override
+ public ExtendedIterator<Node> listPredicates()
{ return expectOnlyNodes( predicates.domain() ); }
private ExtendedIterator<Node> expectOnlyNodes( Iterator<Object> elements )
{ return WrappedIterator.<Object>createNoRemove( elements ).mapWith( expectNode ); }
private static final Map1<Object, Node> expectNode = new Map1<Object, Node>()
- { public Node map1( Object o ) { return (Node) o; }};
+ { @Override
+ public Node map1( Object o ) { return (Node) o; }};
- public ExtendedIterator<Node> listObjects()
+ @Override
+ public ExtendedIterator<Node> listObjects()
{
return new ObjectIterator( objects.domain() )
{
@@ -109,7 +119,8 @@ public abstract class GraphTripleStoreBa
/**
Answer true iff this triple store contains the (concrete) triple <code>t</code>.
*/
- public boolean contains( Triple t )
+ @Override
+ public boolean contains( Triple t )
{ return subjects.containsBySameValueAs( t ); }
public boolean containsByEquality( Triple t )
@@ -132,7 +143,8 @@ public abstract class GraphTripleStoreBa
(ANY, P, O) searches on largish models with few predicates declined
dramatically - specifically on the not-galen.owl ontology.
*/
- public ExtendedIterator<Triple> find( TripleMatch tm )
+ @Override
+ public ExtendedIterator<Triple> find( TripleMatch tm )
{
Triple t = tm.asTriple();
Node pm = t.getPredicate();
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashCommon.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashCommon.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashCommon.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashCommon.java Wed Oct 19 11:47:05 2011
@@ -85,7 +85,8 @@ public abstract class HashCommon<Key>
A NotifyEmpty instance that ignores the notification.
*/
public static NotifyEmpty ignore = new NotifyEmpty()
- { public void emptied() { }};
+ { @Override
+ public void emptied() { }};
/**
Method to call to notify that the collection has become empty.
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedBunchMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedBunchMap.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedBunchMap.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedBunchMap.java Wed Oct 19 11:47:05 2011
@@ -28,21 +28,25 @@ public class HashedBunchMap extends Hash
Clear this map: all entries are removed. The keys <i>and value</i> array
elements are set to null (so the values may be garbage-collected).
*/
+ @Override
public void clear()
{
size = 0;
for (int i = 0; i < capacity; i += 1) keys[i] = values[i] = null;
}
+ @Override
public long size()
{ return size; }
+ @Override
public TripleBunch get( Object key )
{
int slot = findSlot( key );
return slot < 0 ? values[~slot] : null;
}
+ @Override
public void put( Object key, TripleBunch value )
{
int slot = findSlot( key );
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedTripleBunch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedTripleBunch.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedTripleBunch.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/HashedTripleBunch.java Wed Oct 19 11:47:05 2011
@@ -24,6 +24,7 @@ public class HashedTripleBunch extends H
@Override protected Triple[] newKeyArray( int size )
{ return new Triple[size]; }
+ @Override
public boolean contains( Triple t )
{ return findSlot( t ) < 0; }
@@ -39,6 +40,7 @@ public class HashedTripleBunch extends H
}
}
+ @Override
public boolean containsBySameValueAs( Triple t )
{ return findSlotBySameValueAs( t ) < 0; }
@@ -46,6 +48,7 @@ public class HashedTripleBunch extends H
Answer the number of items currently in this TripleBunch.
@see com.hp.hpl.jena.mem.TripleBunch#size()
*/
+ @Override
public int size()
{ return size; }
@@ -56,6 +59,7 @@ public class HashedTripleBunch extends H
public int currentCapacity()
{ return capacity; }
+ @Override
public void add( Triple t )
{
keys[findSlot( t )] = t;
@@ -82,12 +86,15 @@ public class HashedTripleBunch extends H
changes += 1;
}
+ @Override
public ExtendedIterator<Triple> iterator()
{ return iterator( NotifyEmpty.ignore ); }
+ @Override
public ExtendedIterator<Triple> iterator( final NotifyEmpty container )
{ return keyIterator( container ); }
+ @Override
public void app( Domain d, StageElement next, MatchOrBind s )
{
int i = capacity, initialChanges = changes;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/NodeToTriplesMapBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/NodeToTriplesMapBase.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/NodeToTriplesMapBase.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/NodeToTriplesMapBase.java Wed Oct 19 11:47:05 2011
@@ -111,6 +111,7 @@ public abstract class NodeToTriplesMapBa
class NotifyMe implements HashCommon.NotifyEmpty
{
+ @Override
public void emptied()
{ nodes.remove(); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/SetBunch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/SetBunch.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/SetBunch.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/SetBunch.java Wed Oct 19 11:47:05 2011
@@ -31,9 +31,11 @@ public class SetBunch implements TripleB
return o.isLiteral() ? o.getLiteralDatatype() == null : true;
}
+ @Override
public boolean contains( Triple t )
{ return elements.contains( t ); }
+ @Override
public boolean containsBySameValueAs( Triple t )
{ return equalsObjectOK( t ) ? elements.contains( t ) : slowContains( t ); }
@@ -45,23 +47,29 @@ public class SetBunch implements TripleB
return false;
}
+ @Override
public int size()
{ return elements.size(); }
+ @Override
public void add( Triple t )
{ elements.add( t ); }
+ @Override
public void remove( Triple t )
{ elements.remove( t ); }
+ @Override
public ExtendedIterator<Triple> iterator( HashCommon.NotifyEmpty container )
{
return iterator();
}
+ @Override
public ExtendedIterator<Triple> iterator()
{ return WrappedIterator.create( elements.iterator() ); }
+ @Override
public void app( Domain d, StageElement next, MatchOrBind s )
{
Iterator<Triple> it = iterator();
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/WrappedHashMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/WrappedHashMap.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/WrappedHashMap.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/WrappedHashMap.java Wed Oct 19 11:47:05 2011
@@ -17,21 +17,27 @@ public class WrappedHashMap implements B
{
protected final Map<Object, TripleBunch> map = CollectionFactory.createHashedMap();
+ @Override
public void clear()
{ map.clear(); }
+ @Override
public long size()
{ return map.size(); }
+ @Override
public TripleBunch get( Object key )
{ return map.get( key ); }
+ @Override
public void put( Object key, TripleBunch value )
{ map.put( key, value ); }
+ @Override
public void remove( Object key )
{ map.remove( key ); }
+ @Override
public ExtendedIterator<Object> keyIterator()
{ return WrappedIterator.create( map.keySet().iterator() ); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/GraphMemFaster.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/GraphMemFaster.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/GraphMemFaster.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/GraphMemFaster.java Wed Oct 19 11:47:05 2011
@@ -87,6 +87,7 @@ public class GraphMemFaster extends Grap
@see com.hp.hpl.jena.graph.GraphStatisticsHandler#getStatistic(com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Node)
*/
+ @Override
public long getStatistic( Node S, Node P, Node O )
{
if (reifier.size() > 0) return -1;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/NodeToTriplesMapFaster.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/NodeToTriplesMapFaster.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/NodeToTriplesMapFaster.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/mem/faster/NodeToTriplesMapFaster.java Wed Oct 19 11:47:05 2011
@@ -80,6 +80,7 @@ public class NodeToTriplesMapFaster exte
{ this.key = key; }
// TODO fix the way this interacts (badly) with iteration and CMEs.
+ @Override
public void emptied()
{ if (false) throw new JenaException( "BOOM" ); /* System.err.println( ">> OOPS" ); */ bunchMap.remove( key ); }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java Wed Oct 19 11:47:05 2011
@@ -28,6 +28,7 @@ public abstract class JenaReaderBase imp
public JenaReaderBase() {}
+ @Override
final
public void read(Model model, Reader r, String base)
{
@@ -35,6 +36,7 @@ public abstract class JenaReaderBase imp
readImpl(model, r, base) ;
}
+ @Override
final
public void read(Model model, java.lang.String url)
{
@@ -62,12 +64,14 @@ public abstract class JenaReaderBase imp
}
}
+ @Override
final
public void read(Model model, InputStream in, String base)
{
readImpl(model, FileUtils.asBufferedUTF8(in), base) ;
}
+ @Override
final
public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
{
@@ -76,6 +80,7 @@ public abstract class JenaReaderBase imp
return old ;
}
+ @Override
final
public Object setProperty(String propName, Object propValue)
{ return null ; }
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriter.java Wed Oct 19 11:47:05 2011
@@ -122,6 +122,7 @@ public class N3JenaWriter implements RDF
* @see #write(Model,Writer,String)
*/
+ @Override
public void write(Model model, Writer out, String base)
{
writer.write(model, out, base) ;
@@ -151,6 +152,7 @@ public class N3JenaWriter implements RDF
* @see #write(Model,Writer,String)
*/
+ @Override
public void write(Model model, OutputStream out, String base)
{
writer.write(model, out, base) ;
@@ -160,6 +162,7 @@ public class N3JenaWriter implements RDF
/**
* @see com.hp.hpl.jena.rdf.model.RDFWriter#setProperty(java.lang.String, java.lang.Object)
*/
+ @Override
public Object setProperty(String propName, Object propValue)
{
return writer.setProperty(propName, propValue) ;
@@ -168,6 +171,7 @@ public class N3JenaWriter implements RDF
/**
* @see com.hp.hpl.jena.rdf.model.RDFWriter#setErrorHandler(com.hp.hpl.jena.rdf.model.RDFErrorHandler)
*/
+ @Override
public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
{
return writer.setErrorHandler(errHandler) ;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java Wed Oct 19 11:47:05 2011
@@ -116,13 +116,15 @@ public class N3JenaWriterCommon implemen
// ----------------------------------------------------
// Jena RDFWriter interface
- public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
+ @Override
+ public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler)
{
RDFErrorHandler old = errorHandler;
errorHandler = errHandler;
return old;
}
+ @Override
public Object setProperty(String propName, Object propValue)
{
if ( ! ( propValue instanceof String ) )
@@ -164,6 +166,7 @@ public class N3JenaWriterCommon implemen
* @see #write(Model,Writer,String)
*/
+ @Override
public void write(Model baseModel, Writer _out, String base)
{
if (!(_out instanceof BufferedWriter))
@@ -185,7 +188,8 @@ public class N3JenaWriterCommon implemen
* @see #write(Model,Writer,String)
*/
- public synchronized void write(Model model, OutputStream output, String base)
+ @Override
+ public synchronized void write(Model model, OutputStream output, String base)
{
try {
Writer w = new BufferedWriter(new OutputStreamWriter(output, "UTF-8")) ;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/Turtle2NTriples.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/Turtle2NTriples.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/Turtle2NTriples.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/Turtle2NTriples.java Wed Oct 19 11:47:05 2011
@@ -18,6 +18,7 @@ public class Turtle2NTriples implements
PrintStream out = System.out ;
public Turtle2NTriples(PrintStream out) { this.out = out ; }
+ @Override
public void triple(int line, int col, Triple triple)
{
//Check it's valid triple.
@@ -81,12 +82,15 @@ public class Turtle2NTriples implements
System.err.println("Illegal node: "+node) ;
}
+ @Override
public void startFormula(int line, int col)
{ throw new TurtleParseException("["+line+", "+col+"] : Error: Formula found") ; }
+ @Override
public void endFormula(int line, int col)
{ throw new TurtleParseException("["+line+", "+col+"] : Error: Formula found") ; }
+ @Override
public void prefix(int line, int col, String prefix, String iri)
{ }
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventDump.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventDump.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventDump.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventDump.java Wed Oct 19 11:47:05 2011
@@ -12,6 +12,7 @@ import com.hp.hpl.jena.graph.Triple;
public class TurtleEventDump implements TurtleEventHandler
{
+ @Override
public void triple(int line, int col, Triple triple)
{
System.out.print(mark(line, col)) ;
@@ -19,12 +20,14 @@ public class TurtleEventDump implements
System.out.println(triple.toString()) ;
}
+ @Override
public void startFormula(int line, int col)
{
System.out.print(mark(line, col)) ;
System.out.println("{") ;
}
+ @Override
public void endFormula(int line, int col)
{
System.out.print(mark(line, col)) ;
@@ -33,6 +36,7 @@ public class TurtleEventDump implements
private String mark(int line, int col) { return "["+line+", "+col+"]" ; }
+ @Override
public void prefix(int line, int col, String prefix, String iri)
{
System.out.print(mark(line, col)) ;
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventNull.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventNull.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventNull.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleEventNull.java Wed Oct 19 11:47:05 2011
@@ -14,9 +14,13 @@ import com.hp.hpl.jena.graph.Triple;
*/
public class TurtleEventNull implements TurtleEventHandler
{
+ @Override
public void triple(int line, int col, Triple triple) {}
+ @Override
public void startFormula(int line, int col) {}
+ @Override
public void endFormula(int line, int col) {}
+ @Override
public void prefix(int line, int col, String prefix, String iri) {}
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleRDFGraphInserter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleRDFGraphInserter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleRDFGraphInserter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/n3/turtle/TurtleRDFGraphInserter.java Wed Oct 19 11:47:05 2011
@@ -16,6 +16,7 @@ public class TurtleRDFGraphInserter impl
Graph graph = null ;
public TurtleRDFGraphInserter(Graph graph) { this.graph = graph ; }
+ @Override
public void triple(int line, int col, Triple triple)
{
//Check it's valid triple.
@@ -33,12 +34,15 @@ public class TurtleRDFGraphInserter impl
graph.add(triple) ;
}
+ @Override
public void startFormula(int line, int col)
{ throw new TurtleParseException("["+line+", "+col+"] : Error: Formula found") ; }
+ @Override
public void endFormula(int line, int col)
{ throw new TurtleParseException("["+line+", "+col+"] : Error: Formula found") ; }
+ @Override
public void prefix(int line, int col, String prefix, String iri)
{ graph.getPrefixMapping().setNsPrefix(prefix, iri) ; }
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntDocumentManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntDocumentManager.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntDocumentManager.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntDocumentManager.java Wed Oct 19 11:47:05 2011
@@ -1030,6 +1030,7 @@ public class OntDocumentManager
// otherwise, we use the model maker to get the model anew
Model m = spec.getImportModelGetter()
.getModel( importURI, new ModelReader() {
+ @Override
public Model readModel( Model toRead, String URL ) {
read( toRead, URL, true );
return toRead;
@@ -1164,10 +1165,12 @@ public class OntDocumentManager
public static class DefaultReadHook
implements ReadHook
{
+ @Override
public void afterRead( Model model, String source, OntDocumentManager odm ) {
// do nothing
}
+ @Override
public String beforeRead( Model model, String source, OntDocumentManager odm ) {
return source;
}
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntModel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntModel.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntModel.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntModel.java Wed Oct 19 11:47:05 2011
@@ -1568,6 +1568,7 @@ public interface OntModel
* @param writer A writer to which the XML will be written
* @return this model
*/
+ @Override
public Model write( Writer writer ) ;
/**
@@ -1587,6 +1588,7 @@ public interface OntModel
* @param lang The output language
* @return this model
*/
+ @Override
public Model write( Writer writer, String lang ) ;
/**
@@ -1608,6 +1610,7 @@ public interface OntModel
* @param lang The language in which the RDF should be written
* @return this model
*/
+ @Override
public Model write( Writer writer, String lang, String base );
/**
@@ -1624,6 +1627,7 @@ public interface OntModel
* @param out The output stream to which the XML will be written
* @return This model
*/
+ @Override
public Model write( OutputStream out );
/**
@@ -1641,6 +1645,7 @@ public interface OntModel
* @param lang The output language
* @return This model
*/
+ @Override
public Model write( OutputStream out, String lang );
/**
@@ -1660,6 +1665,7 @@ public interface OntModel
* @param lang The language in which the RDF should be written
* @return This model
*/
+ @Override
public Model write( OutputStream out, String lang, String base );
/**
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntProperty.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntProperty.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntProperty.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/OntProperty.java Wed Oct 19 11:47:05 2011
@@ -404,6 +404,7 @@ public interface OntProperty
* @exception ConversionException if the resource cannot be converted to a datatype property
* given the language profile and the current state of the underlying model.
*/
+ @Override
public DatatypeProperty asDatatypeProperty();
/**
@@ -412,6 +413,7 @@ public interface OntProperty
* @exception ConversionException if the resource cannot be converted to an object property
* given the language profile and the current state of the underlying model.
*/
+ @Override
public ObjectProperty asObjectProperty();
/**
@@ -489,12 +491,14 @@ public interface OntProperty
* <p>Answer true if this property is a datatype property</p>
* @return True if this this property has an <code>rdf:type</code> that defines it as a datatype property.
*/
+ @Override
public boolean isDatatypeProperty();
/**
* <p>Answer true if this property is an object property</p>
* @return True if this this property has an <code>rdf:type</code> that defines it as an object property.
*/
+ @Override
public boolean isObjectProperty();
/**
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/impl/AbstractProfile.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/impl/AbstractProfile.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/impl/AbstractProfile.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/ontology/impl/AbstractProfile.java Wed Oct 19 11:47:05 2011
@@ -73,6 +73,7 @@ public abstract class AbstractProfile
* @param res A resource (including properties) to test for an alias
* @return True if there is an alias for <code>res</code>
*/
+ @Override
public boolean hasAliasFor( Resource res ) {
return aliasMap().containsKey( res );
}
@@ -89,6 +90,7 @@ public abstract class AbstractProfile
* than one is defined, or null if no alias is defined for <code>res</code>.
*
*/
+ @Override
public Resource getAliasFor( Resource res ) {
return aliasMap().get( res );
}
@@ -102,6 +104,7 @@ public abstract class AbstractProfile
* @return An iterator over the aliases for <code>res</code>. If there are
* no aliases, the empty iterator is returned.
*/
+ @Override
public Iterator<Resource> listAliasesFor( Resource res ) {
return aliasMap().getAll( res );
}