jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1186119 [8/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...
Date Wed, 19 Oct 2011 11:47:53 GMT
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java Wed Oct 19 11:47:05 2011
@@ -63,15 +63,18 @@ public class ModelCom extends EnhGraph
         defaultPrefixMapping = pm;
         return result; }
     
+    @Override
     public QueryHandler queryHandler()
     	{ return getGraph().queryHandler(); }
 		
+    @Override
     public Graph getGraph()
         { return graph; }
                
     protected static Model createWorkModel()
         { return ModelFactory.createDefaultModel(); }
     
+    @Override
     public RDFNode asRDFNode( Node n )
         {
         return n.isLiteral() 
@@ -79,6 +82,7 @@ public class ModelCom extends EnhGraph
           : (RDFNode) this.getNodeAs( n, Resource.class );
         }
 
+    @Override
     public Resource wrapAsResource( Node n )
         {
         if (n.isLiteral()) 
@@ -91,6 +95,7 @@ public class ModelCom extends EnhGraph
     */
     protected ModelReifier modelReifier = new ModelReifier( this ); 
 	
+    @Override
     @Deprecated public Resource getResource(String uri, ResourceF f)  {
         try {
             return f.createResource(getResource(uri));
@@ -99,28 +104,36 @@ public class ModelCom extends EnhGraph
         }
     }
     
+    @Override
     public Model addLiteral( Resource s, Property p, boolean o )  
         { return add(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Model addLiteral( Resource s, Property p, long o )  
         { return add(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Model addLiteral( Resource s, Property p, int o )  
         { return add(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Model addLiteral( Resource s, Property p, char o )  
         { return add(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Model addLiteral( Resource s, Property p, float o )  
         { return add( s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Model addLiteral( Resource s, Property p, double o )  
         { return add(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Model add(Resource s, Property p, String o)  {
         return add( s, p, o, "", false );
     }
     
+    @Override
     public Model add(Resource s, Property p, String o, boolean wellFormed)
         {
         add( s, p, literal( o, "", wellFormed ) );
@@ -133,6 +146,7 @@ public class ModelCom extends EnhGraph
         return this;
     }
     
+    @Override
     public Model add(Resource s, Property p, String lex, RDFDatatype datatype)
     {
         add( s, p, literal( lex, datatype)) ;
@@ -145,64 +159,78 @@ public class ModelCom extends EnhGraph
     private Literal literal( String lex, RDFDatatype datatype)
     { return new LiteralImpl( Node.createLiteral( lex, "", datatype), this ); }
 
+    @Override
     public Model add( Resource s, Property p, String o, String l )
         { return add( s, p, o, l, false ); }
 
+    @Override
     @Deprecated public Model addLiteral( Resource s, Property p, Object o )  
         { return add( s, p, asObject( o ) ); }
 
+    @Override
     public Model addLiteral( Resource s, Property p, Literal o )  
         { return add( s, p, o ); }
     
     private RDFNode asObject( Object o )
         { return o instanceof RDFNode ? (RDFNode) o : createTypedLiteral( o ); }
 
+    @Override
     public Model add( StmtIterator iter )  {
         try { getBulkUpdateHandler().add( asTriples( iter ) ); }
         finally { iter.close(); }
         return this;
     }
     
+    @Override
     public Model add( Model m )  
         { return add( m, false ); }
         
+    @Override
     public Model add( Model m, boolean suppressReifications ) {
         getBulkUpdateHandler().add( m.getGraph(), !suppressReifications );
         return this;
     }
     
+    @Override
     public RDFReader getReader()  {
         return readerFactory.getReader();
     }
     
+    @Override
     public RDFReader getReader(String lang)  {
         return readerFactory.getReader(lang);
     }
     
+    @Override
     public String setReaderClassName(String lang, String className) {
         return readerFactory.setReaderClassName(lang, className);
     } 
     
+    @Override
     public Model read(String url)  {
         readerFactory .getReader() .read(this, url);
         return this;
     }
     
+    @Override
     public Model read(Reader reader, String base)  {
         readerFactory .getReader() .read(this, reader, base);
         return this;
     }
     
-  	public Model read(InputStream reader, String base)  {
+  	@Override
+    public Model read(InputStream reader, String base)  {
   		readerFactory .getReader() .read(this, reader, base);
   		return this;
   	} 
     
+    @Override
     public Model read(String url, String lang)  {
         readerFactory. getReader(lang) .read(this, url);
         return this;
     }
     
+    @Override
     public Model read( String url, String base, String lang )
         {
         try 
@@ -215,13 +243,15 @@ public class ModelCom extends EnhGraph
         return this;
         }
     
+    @Override
     public Model read(Reader reader, String base, String lang)
        {
         readerFactory .getReader(lang) .read(this, reader, base);
         return this;
        }
     
-  	public Model read(InputStream reader, String base, String lang)
+  	@Override
+    public Model read(InputStream reader, String base, String lang)
   	   {
   		readerFactory .getReader(lang) .read(this, reader, base);
   		return this;
@@ -231,6 +261,7 @@ public class ModelCom extends EnhGraph
         Get the model's writer after priming it with the model's namespace
         prefixes.
     */
+    @Override
     public RDFWriter getWriter()  {
         return writerFactory.getWriter();
     }
@@ -239,119 +270,145 @@ public class ModelCom extends EnhGraph
         Get the model's writer after priming it with the model's namespace
         prefixes.
     */
+    @Override
     public RDFWriter getWriter(String lang)  {
         return writerFactory.getWriter(lang);
     }
     
 
+    @Override
     public String setWriterClassName(String lang, String className) {
         return writerFactory.setWriterClassName(lang, className);
     }
     
+    @Override
     public Model write(Writer writer) 
         {
         getWriter() .write(this, writer, "");
         return this;
         }
     
+    @Override
     public Model write(Writer writer, String lang) 
         {
         getWriter(lang) .write(this, writer, "");
         return this;
         }
     
+    @Override
     public Model write(Writer writer, String lang, String base)
         {
         getWriter(lang) .write(this, writer, base);
         return this;
         }
     
-  	public Model write( OutputStream writer )
+  	@Override
+    public Model write( OutputStream writer )
         {
         getWriter() .write(this, writer, "");
   		return this;    
         }
     
-  	public Model write(OutputStream writer, String lang) 
+  	@Override
+    public Model write(OutputStream writer, String lang) 
         {
   		getWriter(lang) .write(this, writer, "");
   		return this;
   	    }
     
-  	public Model write(OutputStream writer, String lang, String base)
+  	@Override
+    public Model write(OutputStream writer, String lang, String base)
   	    {
         getWriter(lang) .write(this, writer, base);
   		return this;
   	    }
     
+    @Override
     public Model remove(Statement s)  {
         graph.delete(s.asTriple());
         return this;
     }
     
+    @Override
     public Model remove( Resource s, Property p, RDFNode o ) {
         graph.delete( Triple.create( s.asNode(), p.asNode(), o.asNode() ) );
         return this;
     }
         
     
+    @Override
     public Model remove( StmtIterator iter ) 
         {
         getBulkUpdateHandler().delete( asTriples( iter ) );
         return this;
         }
     
+    @Override
     public Model remove( Model m )
         { return remove( m, false ); }
         
+    @Override
     public Model remove( Model m, boolean suppressReifications ) 
         {
         getBulkUpdateHandler().delete( m.getGraph(), !suppressReifications );
         return this;
         }
     
+    @Override
     public Model removeAll()
         { 
         getGraph().getBulkUpdateHandler().removeAll();
         return this; 
         }
     
+    @Override
     public Model removeAll( Resource s, Property p, RDFNode o )
         {
         getGraph().getBulkUpdateHandler().remove( asNode( s ), asNode( p ), asNode( o ) );
         return this;
         }
         
+    @Override
     public boolean containsLiteral( Resource s, Property p, boolean o )
         { return contains(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public boolean containsLiteral( Resource s, Property p, long o )
         { return contains(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public boolean containsLiteral( Resource s, Property p, int o )
         { return contains(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public boolean containsLiteral( Resource s, Property p, char o )
         { return contains(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public boolean containsLiteral( Resource s, Property p, float o )
         { return contains(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public boolean containsLiteral( Resource s, Property p, double o )
         { return contains(s, p, createTypedLiteral( o ) ); }
     
+    @Override
     public boolean contains( Resource s, Property p, String o )
         { return contains( s, p, o, "" ); }
     
+    @Override
     public boolean contains( Resource s, Property p, String o, String l )
         { return contains( s, p, literal( o, l, false ) ); }
     
+    @Override
     public boolean containsLiteral(Resource s, Property p, Object o)
         { return contains( s, p, asObject( o ) ); }
     
+    @Override
     public boolean containsAny( Model model ) 
         { return containsAnyThenClose( model.listStatements() ); }
     
+    @Override
     public boolean containsAll( Model model )  
         { return containsAllThenClose( model.listStatements() ); }
     
@@ -361,12 +418,14 @@ public class ModelCom extends EnhGraph
     protected boolean containsAllThenClose( StmtIterator iter )
         { try { return containsAll( iter ); } finally { iter.close(); } }
     
+    @Override
     public boolean containsAny( StmtIterator iter ) 
         {
         while (iter.hasNext()) if (contains(iter.nextStatement())) return true;
         return false;
         }
     
+    @Override
     public boolean containsAll( StmtIterator iter )  
         {
         while (iter.hasNext()) if (!contains(iter.nextStatement())) return false;
@@ -379,31 +438,39 @@ public class ModelCom extends EnhGraph
             ( graph.find( asNode( S ), asNode( P ), O ), this );
         }
     
+    @Override
     public StmtIterator listStatements( Resource S, Property P, RDFNode O )
         { return listStatements( S, P, asNode( O ) ); }
     
+    @Override
     public StmtIterator listStatements( Resource S, Property P, String O ) {
         return O == null ? listStatements(S, P, Node.ANY) 
                 :  listStatements( S, P, Node.createLiteral( O ) ); 
     }
     
+    @Override
     public StmtIterator listStatements( Resource S, Property P, String O, String L ) {
         return O == null ? listStatements(S, P, Node.ANY) 
                 :  listStatements( S, P, Node.createLiteral( O, L, false ) ); 
     }
     
+    @Override
     public StmtIterator listLiteralStatements( Resource S, Property P, boolean O )
         { return listStatements( S, P, createTypedLiteral( O ) ); }
     
+    @Override
     public StmtIterator listLiteralStatements( Resource S, Property P, long O )
         { return listStatements( S, P, createTypedLiteral( O ) ); }
     
+    @Override
     public StmtIterator listLiteralStatements( Resource S, Property P, char  O )
         { return listStatements( S, P, createTypedLiteral( O ) ); }
     
+    @Override
     public StmtIterator listLiteralStatements( Resource S, Property P, float O )
          { return listStatements( S, P, createTypedLiteral( O ) ); }
     
+    @Override
     public StmtIterator listLiteralStatements( Resource S, Property P, double  O )
         { return listStatements( S, P, createTypedLiteral( O ) ); }
     
@@ -411,45 +478,59 @@ public class ModelCom extends EnhGraph
          list resources with property [was: list subjects with property]
     */
         
+    @Override
     public ResIterator listResourcesWithProperty( Property p, boolean o )
         { return listResourcesWithProperty(p, createTypedLiteral( o ) ); }
     
+    @Override
     public ResIterator listResourcesWithProperty( Property p, char o )
         { return listResourcesWithProperty(p, createTypedLiteral( o ) ); }
     
+    @Override
     public ResIterator listResourcesWithProperty( Property p, long o )
         { return listResourcesWithProperty(p, createTypedLiteral( o ) ); }
     
+    @Override
     public ResIterator listResourcesWithProperty( Property p, float o )
         { return listResourcesWithProperty(p, createTypedLiteral( o ) ); }
     
+    @Override
     public ResIterator listResourcesWithProperty( Property p, double o )
         { return listResourcesWithProperty(p, createTypedLiteral( o ) ); }
     
+    @Override
     public ResIterator listResourcesWithProperty( Property p, Object o )
         { return listResourcesWithProperty( p, createTypedLiteral( o ) ); }
     
+    @Override
     public ResIterator listSubjectsWithProperty( Property p, RDFNode o )
         { return listResourcesWithProperty( p, o ); }
     
+    @Override
     public ResIterator listSubjectsWithProperty( Property p, String o )
         { return listSubjectsWithProperty( p, o, "" ); }
     
+    @Override
     public ResIterator listSubjectsWithProperty( Property p, String o, String l )
         { return listResourcesWithProperty(p, literal( o, l, false ) ); }
     
+    @Override
     public Resource createResource( Resource type )  
         { return createResource().addProperty( RDF.type, type ); }
     
+    @Override
     public Resource createResource( String uri,Resource type )
         { return getResource( uri ).addProperty( RDF.type, type ); }
     
+    @Override
     @Deprecated public Resource createResource( ResourceF f )  
         { return createResource( null, f ); }
     
+    @Override
     public Resource createResource( AnonId id )
         { return new ResourceImpl( id, this ); }
         
+    @Override
     @Deprecated public Resource createResource( String uri, ResourceF f )  
         { return f.createResource( createResource( uri ) ); }
     
@@ -462,6 +543,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */
+    @Override
     public Literal createTypedLiteral( boolean v )  {
         return createTypedLiteral( new Boolean( v ) );
     }
@@ -472,6 +554,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */   
+    @Override
     public Literal createTypedLiteral(int v)   {
         return createTypedLiteral(new Integer(v));
     }
@@ -482,6 +565,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */   
+    @Override
     public Literal createTypedLiteral(long v)   {
         return createTypedLiteral(new Long(v));
     }
@@ -492,6 +576,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */
+    @Override
     public Literal createTypedLiteral(char v)  {
         return createTypedLiteral(new Character(v));
     }
@@ -502,6 +587,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */
+    @Override
     public Literal createTypedLiteral(float v)  {
         return createTypedLiteral(new Float(v));
     }
@@ -512,6 +598,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */
+    @Override
     public Literal createTypedLiteral(double v)  {
         return createTypedLiteral(new Double(v));
     }
@@ -522,6 +609,7 @@ public class ModelCom extends EnhGraph
      * 
      * @return a new literal representing the value v
      */
+    @Override
     public Literal createTypedLiteral(String v)  {
         LiteralLabel ll = LiteralLabelFactory.create(v);
         return new LiteralImpl(Node.createLiteral(ll), this);
@@ -530,6 +618,7 @@ public class ModelCom extends EnhGraph
     /**
      * Create a typed literal xsd:dateTime from a Calendar object. 
      */
+    @Override
     public Literal createTypedLiteral(Calendar cal) {
         Object value = new XSDDateTime(cal);
         LiteralLabel ll = LiteralLabelFactory.create(value, "", XSDDatatype.XSDdateTime);
@@ -546,6 +635,7 @@ public class ModelCom extends EnhGraph
      * @param dtype the type of the literal, null for old style "plain" literals
      * @throws DatatypeFormatException if lex is not a legal form of dtype
      */
+    @Override
     public Literal createTypedLiteral(String lex, RDFDatatype dtype) 
                                         throws DatatypeFormatException {
         return new LiteralImpl( Node.createLiteral( lex, "", dtype ), this);
@@ -557,6 +647,7 @@ public class ModelCom extends EnhGraph
      * @param value the value of the literal
      * @param dtype the type of the literal, null for old style "plain" literals
      */
+    @Override
     public Literal createTypedLiteral(Object value, RDFDatatype dtype) {
         LiteralLabel ll = LiteralLabelFactory.create(value, "", dtype);
         return new LiteralImpl( Node.createLiteral(ll), this );
@@ -571,6 +662,7 @@ public class ModelCom extends EnhGraph
      * @param typeURI the uri of the type of the literal, null for old style "plain" literals
      * @throws DatatypeFormatException if lex is not a legal form of dtype
      */
+    @Override
     public Literal createTypedLiteral(String lex, String typeURI)  {
         RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(typeURI);
         LiteralLabel ll = LiteralLabelFactory.createLiteralLabel( lex, "", dt );
@@ -583,6 +675,7 @@ public class ModelCom extends EnhGraph
      * @param value the value of the literal
      * @param typeURI the URI of the type of the literal, null for old style "plain" literals
      */
+    @Override
     public Literal createTypedLiteral(Object value, String typeURI) {
         RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(typeURI);
         LiteralLabel ll = LiteralLabelFactory.create(value, "", dt);
@@ -595,6 +688,7 @@ public class ModelCom extends EnhGraph
      * representation for this java class. No language tag is supplied.
      * @param value the literal value to encapsulate
      */
+    @Override
     public Literal createTypedLiteral( Object value ) 
         {
         // Catch special case of a Calendar which we want to act as if it were an XSDDateTime
@@ -604,59 +698,76 @@ public class ModelCom extends EnhGraph
         return new LiteralImpl( Node.createLiteral( ll ), this);
         }
     
+    @Override
     public Literal createLiteral( String v )  
         { return createLiteral( v, "" ); }
     
+    @Override
     public Literal createLiteral( String v, String l )  
         { return literal( v, l, false ); }
     
+    @Override
     public Literal createLiteral( String v, boolean wellFormed ) 
         { return literal( v, "", wellFormed ); }
     
     public Literal createLiteral(String v, String l, boolean wellFormed) 
         { return literal( v, l, wellFormed ); }
     
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, boolean o )
         { return createStatement( r, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, long o )
         { return createStatement( r, p, createTypedLiteral( o ) ); }
 
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, int o )
         { return createStatement( r, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, char o )
         { return createStatement( r, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, float o )
         { return createStatement( r, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, double o )
         { return createStatement( r, p, createTypedLiteral( o ) ); }
     
+    @Override
     public Statement createStatement( Resource r, Property p, String o )
         { return createStatement( r, p, createLiteral( o ) ); }
 
+    @Override
     public Statement createLiteralStatement( Resource r, Property p, Object o )
         { return createStatement( r, p, asObject( o ) ); }
     
+    @Override
     public Statement createStatement
         ( Resource r, Property p, String o, boolean wellFormed )  
         { return createStatement( r, p, o, "", wellFormed ); }
     
+    @Override
     public Statement createStatement(Resource r, Property p, String o, String l)
         { return createStatement( r, p, o, l, false ); }
     
+    @Override
     public Statement createStatement
         ( Resource r, Property p, String o, String l, boolean wellFormed )  
         { return createStatement( r, p, literal( o, l, wellFormed ) ); }
     
+    @Override
     public Bag createBag()  
         { return createBag( null ); }
     
+    @Override
     public Alt createAlt()  
         { return createAlt( null ); }
     
+    @Override
     public Seq createSeq()  
         { return createSeq( null ); }
     
@@ -664,6 +775,7 @@ public class ModelCom extends EnhGraph
         Answer a (the) new empty list
         @return An RDF-encoded list of no elements (ie nil)
     */
+    @Override
     public RDFList createList() 
         { return getResource( RDF.nil.getURI() ).as( RDFList.class ); }
     
@@ -673,6 +785,7 @@ public class ModelCom extends EnhGraph
      * @param members An iterator, each value of which is expected to be an RDFNode.
      * @return An RDF-encoded list of the elements of the iterator
      */
+    @Override
     public RDFList createList( Iterator<? extends RDFNode> members ) 
         {
         RDFList list = createList();
@@ -686,49 +799,62 @@ public class ModelCom extends EnhGraph
      * @param members An array of RDFNodes that will be the members of the list
      * @return An RDF-encoded list 
      */
+    @Override
     public RDFList createList( RDFNode[] members ) {
         return createList( Arrays.asList( members ).iterator() );
     }
     
+    @Override
     public RDFNode getRDFNode( Node n )
         { return asRDFNode( n ); }
     
+    @Override
     public Resource getResource( String uri )  
         { return IteratorFactory.asResource(makeURI(uri),this); }
     
+    @Override
     public Property getProperty( String uri )  
         {
         if (uri == null) throw new InvalidPropertyURIException( null );
         return IteratorFactory.asProperty( makeURI(uri), this );
         }
     
+    @Override
     public Property getProperty( String nameSpace,String localName )
         { return getProperty( nameSpace + localName ); }
     
+    @Override
     public Seq getSeq( String uri )  
         { return (Seq) IteratorFactory.asResource( makeURI( uri ),Seq.class, this); }
     
+    @Override
     public Seq getSeq( Resource r )  
         { return r.as( Seq.class ); }
     
+    @Override
     public Bag getBag( String uri )  
         { return (Bag) IteratorFactory.asResource( makeURI( uri ),Bag.class, this ); }
     
+    @Override
     public Bag getBag( Resource r )  
         { return r.as( Bag.class ); }
     
     static private Node makeURI(String uri) 
         { return uri == null ? Node.createAnon() : Node.createURI( uri ); }
     
+    @Override
     public Alt getAlt( String uri )  
         { return (Alt) IteratorFactory.asResource( makeURI(uri) ,Alt.class, this ); }
     
+    @Override
     public Alt getAlt( Resource r )  
         { return r.as( Alt.class ); }
     
+    @Override
     public long size()  
         { return graph.size(); }
 
+    @Override
     public boolean isEmpty()
         { return graph.isEmpty(); }
         
@@ -758,6 +884,7 @@ public class ModelCom extends EnhGraph
         return types.iterator();
         }
      
+    @Override
     public NsIterator listNameSpaces()  {
         Set<String> nameSpaces = CollectionFactory.createHashedSet();
         updateNamespace( nameSpaces, listPredicates() );
@@ -768,60 +895,73 @@ public class ModelCom extends EnhGraph
     private PrefixMapping getPrefixMapping()
         { return getGraph().getPrefixMapping(); }
     
+    @Override
     public boolean samePrefixMappingAs( PrefixMapping other )
         { return getPrefixMapping().samePrefixMappingAs( other ); }
         
+    @Override
     public PrefixMapping lock()
         {
         getPrefixMapping().lock();
         return this;
         }
         
+    @Override
     public PrefixMapping setNsPrefix( String prefix, String uri )
         { 
         getPrefixMapping().setNsPrefix( prefix, uri ); 
         return this;
         }
         
+    @Override
     public PrefixMapping removeNsPrefix( String prefix )
         {
         getPrefixMapping().removeNsPrefix( prefix );
         return this;
         }
     
+    @Override
     public PrefixMapping setNsPrefixes( PrefixMapping pm )
         { 
         getPrefixMapping().setNsPrefixes( pm );
         return this;
         }
         
+    @Override
     public PrefixMapping setNsPrefixes( Map<String, String> map )
         { 
         getPrefixMapping().setNsPrefixes( map ); 
         return this;
         }
     
+    @Override
     public PrefixMapping withDefaultMappings( PrefixMapping other )
         {
         getPrefixMapping().withDefaultMappings( other );
         return this;
         }
         
+    @Override
     public String getNsPrefixURI( String prefix ) 
         { return getPrefixMapping().getNsPrefixURI( prefix ); }
 
+    @Override
     public String getNsURIPrefix( String uri )
         { return getPrefixMapping().getNsURIPrefix( uri ); }
                 
+    @Override
     public Map<String, String> getNsPrefixMap()
         { return getPrefixMapping().getNsPrefixMap(); }
         
+    @Override
     public String expandPrefix( String prefixed )
         { return getPrefixMapping().expandPrefix( prefixed ); }
     
+    @Override
     public String qnameFor( String uri )
         { return getPrefixMapping().qnameFor( uri ); }
     
+    @Override
     public String shortForm( String uri )
         { return getPrefixMapping().shortForm( uri ); }
         
@@ -855,12 +995,14 @@ public class ModelCom extends EnhGraph
             }            
         }
         
+    @Override
     public StmtIterator listStatements()  
         { return IteratorFactory.asStmtIterator( GraphUtil.findAll( graph ), this); }
 
     /**
         add a Statement to this Model by adding its SPO components.
     */
+    @Override
     public Model add( Statement s )  
         {
         add( s.getSubject(), s.getPredicate(), s.getObject() );
@@ -871,6 +1013,7 @@ public class ModelCom extends EnhGraph
         Add all the statements to the model by converting them to an array of corresponding
         triples and removing those from the underlying graph.
     */
+    @Override
     public Model add( Statement [] statements )
         {
         getBulkUpdateHandler().add( StatementImpl.asTriples( statements ) );
@@ -884,6 +1027,7 @@ public class ModelCom extends EnhGraph
         Add all the statements to the model by converting the list to an array of
         Statement and removing that.
     */
+    @Override
     public Model add( List<Statement> statements )
         {
         getBulkUpdateHandler().add( asTriples( statements ) );
@@ -902,12 +1046,14 @@ public class ModelCom extends EnhGraph
         { return it.mapWith( mapAsTriple ); }
         
     private Map1<Statement, Triple> mapAsTriple = new Map1<Statement, Triple>()
-        { public Triple map1( Statement s ) { return s.asTriple(); } };
+        { @Override
+        public Triple map1( Statement s ) { return s.asTriple(); } };
         
     /**
         remove all the Statements from the model by converting them to triples and
         removing those triples from the underlying graph.        
     */ 
+    @Override
     public Model remove( Statement [] statements )
         {
         getBulkUpdateHandler().delete( StatementImpl.asTriples( statements ) );        
@@ -918,24 +1064,28 @@ public class ModelCom extends EnhGraph
         Remove all the Statements from the model by converting the List to a
         List(Statement) and removing that.
     */
+    @Override
     public Model remove( List<Statement> statements )
         {
         getBulkUpdateHandler().delete( asTriples( statements ) );
         return this;
         }
            
+    @Override
     public Model add( Resource s, Property p, RDFNode o )  {
         modelReifier.noteIfReified( s, p, o );
         graph.add( Triple.create( s.asNode(), p.asNode(), o.asNode() ) );
         return this;
     }
     
+    @Override
     public ReificationStyle getReificationStyle()
         { return modelReifier.getReificationStyle(); }
         
     /**
         @return an iterator which delivers all the ReifiedStatements in this model
     */
+    @Override
     public RSIterator listReifiedStatements()
         { return modelReifier.listReifiedStatements(); }
 
@@ -943,12 +1093,14 @@ public class ModelCom extends EnhGraph
         @return an iterator each of whose elements is a ReifiedStatement in this
             model such that it's getStatement().equals( st )
     */
+    @Override
     public RSIterator listReifiedStatements( Statement st )
         { return modelReifier.listReifiedStatements( st ); }
                 
     /**
         @return true iff this model has a reification of _s_ in some Statement
     */
+    @Override
     public boolean isReified( Statement s ) 
         { return modelReifier.isReified( s ); }
    
@@ -959,6 +1111,7 @@ public class ModelCom extends EnhGraph
         @param s for which a reification is sought
         @return a ReifiedStatement that reifies _s_
     */
+    @Override
     public Resource getAnyReifiedStatement(Statement s) 
         { return modelReifier.getAnyReifiedStatement( s ); }
     
@@ -966,38 +1119,48 @@ public class ModelCom extends EnhGraph
         remove any ReifiedStatements reifying the given statement
         @param s the statement who's reifications are to be discarded
     */
+    @Override
     public void removeAllReifications( Statement s ) 
         { modelReifier.removeAllReifications( s ); }
         
+    @Override
     public void removeReification( ReifiedStatement rs )
         { modelReifier.removeReification( rs ); }
     	
     /**
         create a ReifiedStatement that encodes _s_ and belongs to this Model.
     */
+    @Override
     public ReifiedStatement createReifiedStatement( Statement s )
         { return modelReifier.createReifiedStatement( s ); }
         
+    @Override
     public ReifiedStatement createReifiedStatement( String uri, Statement s )
         { return modelReifier.createReifiedStatement( uri, s ); }
     
+    @Override
     public boolean contains( Statement s )    
         { return graph.contains( s.asTriple() ); }
     
+    @Override
     public boolean containsResource( RDFNode r )
         { return graph.queryHandler().containsNode( r.asNode() ); }
 
+    @Override
     public boolean contains( Resource s, Property p ) 
         { return contains( s, p, (RDFNode) null );  }
     
+    @Override
     public boolean contains( Resource s, Property p, RDFNode o )
         { return graph.contains( asNode( s ), asNode( p ), asNode( o ) ); }
         
+    @Override
     public Statement getRequiredProperty( Resource s, Property p )  
         { Statement st = getProperty( s, p );
         if (st == null) throw new PropertyNotFoundException( p );
         return st; }
     
+    @Override
     public Statement getProperty( Resource s, Property p )
         {
         StmtIterator iter = listStatements( s, p, (RDFNode) null );
@@ -1020,27 +1183,35 @@ public class ModelCom extends EnhGraph
         return IteratorFactory.asResIterator( xit, this );
         }
                 
+    @Override
     public ResIterator listSubjects()  
         { return listSubjectsFor( null, null ); }
     
+    @Override
     public ResIterator listResourcesWithProperty(Property p)
         { return listSubjectsFor( p, null ); }
     
+    @Override
     public ResIterator listSubjectsWithProperty(Property p)
         { return listResourcesWithProperty( p ); }
     
+    @Override
     public ResIterator listResourcesWithProperty(Property p, RDFNode o)
         { return listSubjectsFor( p, o ); }
     
+    @Override
     public NodeIterator listObjects()  
         { return listObjectsFor( null, null ); }
     
+    @Override
     public NodeIterator listObjectsOfProperty(Property p)  
         { return listObjectsFor( null, p ); }
     
+    @Override
     public NodeIterator listObjectsOfProperty(Resource s, Property p)
         { return listObjectsFor( s, p ); }
             
+    @Override
     public StmtIterator listStatements( final Selector selector )
         {
         StmtIterator sts = IteratorFactory.asStmtIterator( findTriplesFrom( selector ), this );
@@ -1076,51 +1247,65 @@ public class ModelCom extends EnhGraph
             ( asNode( s.getSubject() ), asNode( s.getPredicate() ), asNode( s.getObject() ) );    
         }
 
+    @Override
     public boolean supportsTransactions() 
         { return getTransactionHandler().transactionsSupported(); }
     	
+    @Override
     public Model begin() 
         { getTransactionHandler().begin(); return this; }
     
+    @Override
     public Model abort() 
         { getTransactionHandler().abort(); return this; }
     
+    @Override
     public Model commit() 
         { getTransactionHandler().commit(); return this; }
     
+    @Override
     public Object executeInTransaction( Command cmd )
         { return getTransactionHandler().executeInTransaction( cmd ); }
         
     private TransactionHandler getTransactionHandler()
         { return getGraph().getTransactionHandler(); }
         
+    @Override
     public boolean independent() 
         { return true; }
     
+    @Override
     public Resource createResource()  
         { return IteratorFactory.asResource( Node.createAnon(),this ); }
     
+    @Override
     public Resource createResource( String uri )  
         { return getResource( uri ); }
     
+    @Override
     public Property createProperty( String uri )  
         { return getProperty( uri ); }
     
+    @Override
     public Property createProperty(String nameSpace, String localName)
         { return getProperty(nameSpace, localName); }
     
     /**
         create a Statement from the given r, p, and o.
     */
+    @Override
     public Statement createStatement(Resource r, Property p, RDFNode o)
         { return new StatementImpl( r, p, o, this ); }
     
+    @Override
     public Bag createBag(String uri)  
         { return (Bag) getBag(uri).addProperty( RDF.type, RDF.Bag ); }
     
+    @Override
     public Alt createAlt( String uri ) 
         { return (Alt) getAlt(uri).addProperty( RDF.type, RDF.Alt ); }
     
+    @Override
     public Seq createSeq(String uri)  
         { return (Seq) getSeq(uri).addProperty( RDF.type, RDF.Seq ); }
 
@@ -1129,6 +1314,7 @@ public class ModelCom extends EnhGraph
         @param t a triple to wrap as a statement
         @return a statement wrapping the triple and in this model
     */
+    @Override
     public Statement asStatement( Triple t )
         { return StatementImpl.toStatement( t, this ); }
         
@@ -1153,23 +1339,29 @@ public class ModelCom extends EnhGraph
         { return new StmtIteratorImpl( new Map1Iterator<Triple, Statement>( mapAsStatement, it ) ); }
     
     protected Map1<Triple, Statement> mapAsStatement = new Map1<Triple, Statement>()
-        { public Statement map1( Triple t ) { return asStatement( t ); } };
+        { @Override
+        public Statement map1( Triple t ) { return asStatement( t ); } };
 	
 	public StmtIterator listBySubject( Container cont )
         { return listStatements( cont, null, (RDFNode) null ); }
 
+    @Override
     public void close() 
         { graph.close(); }
     
+    @Override
     public boolean isClosed()
         { return graph.isClosed(); }
     
+    @Override
     public boolean supportsSetOperations() 
         {return true;}
     
+    @Override
     public Model query( Selector selector )  
         { return createWorkModel() .add( listStatements( selector ) ); }
     
+    @Override
     public Model union( Model model )  
         { return createWorkModel() .add(this) .add( model ); }
     
@@ -1181,6 +1373,7 @@ public class ModelCom extends EnhGraph
         
      	@see com.hp.hpl.jena.rdf.model.Model#intersection(com.hp.hpl.jena.rdf.model.Model)
     */
+    @Override
     public Model intersection( Model other )
         { return this.size() < other.size() ? intersect( this, other ) : intersect( other, this ); }
         
@@ -1217,6 +1410,7 @@ public class ModelCom extends EnhGraph
         return result;
         }
 
+    @Override
     public Model difference(Model model)  {
         Model resultModel = createWorkModel();
         StmtIterator iter = null;
@@ -1260,6 +1454,7 @@ public class ModelCom extends EnhGraph
         Answer whether or not these two graphs are isomorphic, taking the
         hidden (reification) statements into account.
     */
+    @Override
     public boolean isIsomorphicWith( Model m )
         {
         Graph L = ModelFactory.withHiddenStatements( this ).getGraph();            
@@ -1274,17 +1469,20 @@ public class ModelCom extends EnhGraph
         return modelLock ;
     }
     
+    @Override
     public synchronized Lock getLock()
     {
         return getModelLock() ;
     }
     
     
+    @Override
     public void enterCriticalSection(boolean requestReadLock)
     {
         this.getModelLock().enterCriticalSection(requestReadLock) ;
     }
     
+    @Override
     public void leaveCriticalSection()
     {
         this.getModelLock().leaveCriticalSection() ;
@@ -1297,6 +1495,7 @@ public class ModelCom extends EnhGraph
         @param a ModelChangedListener to register for model events
         @return this model, for cascading 
     */
+    @Override
     public Model register( ModelChangedListener listener )
         {
         getGraph().getEventManager().register( adapt( listener ) );
@@ -1309,6 +1508,7 @@ public class ModelCom extends EnhGraph
         @param  a ModelChangedListener to unregister from model events
         @return this model, for cascading 
     */
+    @Override
     public Model unregister( ModelChangedListener listener )
         {
         getGraph().getEventManager().unregister( adapt( listener ) );
@@ -1325,6 +1525,7 @@ public class ModelCom extends EnhGraph
     public GraphListener adapt( final ModelChangedListener L )
         { return new ModelListenerAdapter( this, L ); }
     
+    @Override
     public Model notifyEvent( Object e )
         {
         getGraph().getEventManager().notifyEvent( getGraph(), e );

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelListenerAdapter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelListenerAdapter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelListenerAdapter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelListenerAdapter.java Wed Oct 19 11:47:05 2011
@@ -30,39 +30,50 @@ public class ModelListenerAdapter implem
     public ModelListenerAdapter( ModelCom m, ModelChangedListener L )
         { this.m = m; this.L = L; }
 
+    @Override
     public void notifyAddArray( Graph graph, Triple [] triples )
         { L.addedStatements( m.asStatements( triples ) ); }
         
+    @Override
     public void notifyDeleteArray( Graph g, Triple [] triples )
         { L.removedStatements( m.asStatements( triples ) ); }
         
+    @Override
     public void notifyAddTriple( Graph g, Triple t )
         { L.addedStatement( m.asStatement( t ) ); }
 
+    @Override
     public void notifyAddList( Graph g, List<Triple> triples )
         { L.addedStatements( m.asStatements( triples ) ); }  
               
+    @Override
     public void notifyAddIterator( Graph g, Iterator<Triple> it )
         { L.addedStatements( m.asStatements( it ) ); }
         
+    @Override
     public void notifyAddGraph( Graph g, Graph added )
         { L.addedStatements( m.asModel( added ) ); }
         
+    @Override
     public void notifyDeleteIterator( Graph g, Iterator<Triple> it )
         { L.removedStatements( m.asStatements( it ) ); }
         
+    @Override
     public void notifyDeleteTriple( Graph g, Triple t )
         { L.removedStatement( m.asStatement( t ) ); }
         
     public void notifyAddIterator( Graph g, List<Triple> triples )
         { L.addedStatements( m.asStatements( triples ) ); }
         
+    @Override
     public void notifyDeleteList( Graph g, List<Triple> triples )
         { L.removedStatements( m.asStatements( triples ) ); }
 
+    @Override
     public void notifyDeleteGraph( Graph g, Graph removed )
         { L.removedStatements( m.asModel( removed ) ); }
     
+    @Override
     public void notifyEvent( Graph g, Object event )
         { L.notifyEvent( m, event ); }
         

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelMakerImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelMakerImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelMakerImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelMakerImpl.java Wed Oct 19 11:47:05 2011
@@ -21,9 +21,11 @@ public class ModelMakerImpl implements M
     public ModelMakerImpl( GraphMaker maker )
         { this.maker = maker; }
         
+    @Override
     public GraphMaker getGraphMaker()
         { return maker; }
         
+    @Override
     public void close()
         { maker.close(); }
        
@@ -33,45 +35,57 @@ public class ModelMakerImpl implements M
     protected Model makeModel( Graph g )
         { return new ModelCom( g ); }
     
+    @Override
     public Model openModelIfPresent( String name )
         { return maker.hasGraph( name ) ? openModel( name ) : null; }
     
+    @Override
     public Model openModel( String name, boolean strict )
         { return makeModel( maker.openGraph( name, strict ) ); }
         
+    @Override
     public Model openModel( String name )
         { return openModel( name, false ); }
         
+    @Override
     public Model createModel( String name, boolean strict )
         { return makeModel( maker.createGraph( name, strict ) ); }
         
+    @Override
     public Model createModel( String name )
         { return createModel( name, false ); }
         
     public Model createModelOver( String name )
         { return createModel( name ); }
         
+    @Override
     public Model createFreshModel()
         { return makeModel( maker.createGraph() ); }
         
+    @Override
     public Model createDefaultModel()
         { return makeModel( maker.getGraph() ); }
         
+    @Override
     public void removeModel( String name )
         { maker.removeGraph( name ); }
         
+    @Override
     public boolean hasModel( String name )
         { return maker.hasGraph( name ); }
       
+    @Override
     public ExtendedIterator<String> listModels()
         { return maker.listGraphs(); }
     
     /**
         ModelGetter implementation component.     
     */
+    @Override
     public Model getModel( String URL )
         { return hasModel( URL ) ? openModel( URL ) : null; }         
     
+    @Override
     public Model getModel( String URL, ModelReader loadIfAbsent )
         { 
         Model already = getModel( URL );

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java Wed Oct 19 11:47:05 2011
@@ -187,6 +187,7 @@ public class ModelReifier
     */
     protected final Map1<Node, ReifiedStatement> mapToRS = new Map1<Node, ReifiedStatement>()
         {
+        @Override
         public ReifiedStatement map1( Node node ) { return getRS( node ); }
         };
 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleReader.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleReader.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleReader.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleReader.java Wed Oct 19 11:47:05 2011
@@ -66,11 +66,13 @@ public class NTripleReader extends Objec
 
     NTripleReader() {
     }
+    @Override
     public void read(Model model, InputStream in, String base)
          {
         // N-Triples must be in ASCII, we permit UTF-8.
         read(model, FileUtils.asUTF8(in), base);
     }
+    @Override
     public void read(Model model, Reader reader, String base)
          {
 
@@ -87,6 +89,7 @@ public class NTripleReader extends Objec
         }
     }
 
+    @Override
     public void read(Model model, String url)  {
         try {
             read(
@@ -102,12 +105,14 @@ public class NTripleReader extends Objec
         }
     }
 
+    @Override
     public Object setProperty(String propName, Object propValue)
          {
         errorHandler.error(new UnknownPropertyException( propName ));
         return null;
     }
 
+    @Override
     public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler) {
         RDFErrorHandler old = this.errorHandler;
         this.errorHandler = errHandler;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java Wed Oct 19 11:47:05 2011
@@ -51,6 +51,7 @@ public class NTripleWriter extends Objec
     
     public NTripleWriter() {
     }
+    @Override
     public void write(Model model, OutputStream out, String base)
          {
         try {
@@ -68,6 +69,7 @@ public class NTripleWriter extends Objec
             errorHandler.error(ioe);
         }
     }
+    @Override
     public void write(Model baseModel, Writer writer, String base)
          {
         try {
@@ -106,6 +108,7 @@ public class NTripleWriter extends Objec
      * @param propValue The new value of the property
      * @return the previous value of the property
      */
+    @Override
     public Object setProperty(String propName, Object propValue) {
         throw new UnknownPropertyException( propName );
     }
@@ -116,6 +119,7 @@ public class NTripleWriter extends Objec
     public String getPrefixFor( String uri )
         { return null; }
 
+    @Override
     public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler) {
         RDFErrorHandler old = this.errorHandler;
         this.errorHandler = errHandler;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NodeIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NodeIteratorImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NodeIteratorImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NodeIteratorImpl.java Wed Oct 19 11:47:05 2011
@@ -23,6 +23,7 @@ public class NodeIteratorImpl extends Wr
         super( iter );
     }
     
+    @Override
     public RDFNode nextNode() {
         return super.next();
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NsIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NsIteratorImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NsIteratorImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/NsIteratorImpl.java Wed Oct 19 11:47:05 2011
@@ -22,6 +22,7 @@ public class NsIteratorImpl extends Wrap
     public NsIteratorImpl( Iterator<String> iter, Object o ) 
         { super( iter ); }
 
+    @Override
     public String nextNs()
         { return next(); }
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/PropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/PropertyImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/PropertyImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/PropertyImpl.java Wed Oct 19 11:47:05 2011
@@ -115,9 +115,11 @@ public class PropertyImpl extends Resour
         this.ordinal = ordinal;
         }
 
+    @Override
     public boolean isProperty()
         { return true; }
 
+    @Override
     public int getOrdinal()
         {
         if (ordinal < 0) ordinal = computeOrdinal();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFDefaultErrorHandler.java Wed Oct 19 11:47:05 2011
@@ -32,14 +32,17 @@ public class RDFDefaultErrorHandler exte
     public RDFDefaultErrorHandler() {
     }
 
+    @Override
     public void warning(Exception e) {
         if (!silent) logger.warn(ParseException.formatMessage(e));
     }
 
+    @Override
     public void error(Exception e) {
     	if (!silent) logger.error(ParseException.formatMessage(e));
     }
 
+    @Override
     public void fatalError(Exception e) {
     	if (!silent) logger.error(ParseException.formatMessage(e));
         throw e instanceof RuntimeException 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFListImpl.java Wed Oct 19 11:47:05 2011
@@ -171,6 +171,7 @@ public class RDFListImpl
      * 
      * @return The length of the list as an integer
      */
+    @Override
     public int size() {
         if (s_checkValid) {
             checkValid();
@@ -193,6 +194,7 @@ public class RDFListImpl
      * @return The value that is associated with the head of the list.
      * @exception EmptyListException if this list is the empty list
      */
+    @Override
     public RDFNode getHead() {
         if (s_checkValid) {
             checkValid();
@@ -213,6 +215,7 @@ public class RDFListImpl
      * @param value The value that will become the value of the list head
      * @exception EmptyListException if this list is the empty list
      */
+    @Override
     public RDFNode setHead( RDFNode value ) {
         if (s_checkValid) {
             checkValid();
@@ -240,6 +243,7 @@ public class RDFListImpl
      * @return The tail of the list, as a list
      * @exception EmptyListException if this list is the empty list
      */
+    @Override
     public RDFList getTail() {
         if (s_checkValid) {
             checkValid();
@@ -261,6 +265,7 @@ public class RDFListImpl
      * @param tail The new tail for this list.
      * @return The old tail.
      */
+    @Override
     public RDFList setTail( RDFList tail ) {
         if (s_checkValid) {
             checkValid();
@@ -277,6 +282,7 @@ public class RDFListImpl
      * 
      * @return True if this is the empty (nil) list, otherwise false.
      */
+    @Override
     public boolean isEmpty() {
         if (s_checkValid) {
             checkValid();
@@ -295,6 +301,7 @@ public class RDFListImpl
      * @param value A new value to add to the head of the list
      * @return The new list, whose head is <code>value</code>
      */
+    @Override
     public RDFList cons( RDFNode value ) {
         if (s_checkValid) {
             checkValid();
@@ -322,6 +329,7 @@ public class RDFListImpl
      * @exception EmptyListUpdateException if an attempt is made to 
      * <code>add</code> to the empty list.
      */
+    @Override
     public void add( RDFNode value ) {
         if (s_checkValid) {
             checkValid();
@@ -354,6 +362,7 @@ public class RDFListImpl
      * @param value A value to add to the end of the list
      * @return The list that results from adding a value to the end of this list 
      */
+    @Override
     public RDFList with( RDFNode value ) {
         if (s_checkValid) {
             checkValid();
@@ -385,6 +394,7 @@ public class RDFListImpl
      * @exception ListIndexException if the list has fewer than (i + 1)
      * elements.
      */
+    @Override
     public RDFNode get( int i ) {
         if (s_checkValid) {
             checkValid();
@@ -408,6 +418,7 @@ public class RDFListImpl
      * @exception ListIndexException if the list has fewer than (i + 1)
      * elements.
      */
+    @Override
     public RDFNode replace( int i, RDFNode value ) {
         if (s_checkValid) {
             checkValid();
@@ -427,6 +438,7 @@ public class RDFListImpl
      * @param value A value to test for
      * @return True if the list contains value.
      */
+    @Override
     public boolean contains( RDFNode value ) {
         return indexOf( value, 0 ) >= 0;
     }
@@ -442,6 +454,7 @@ public class RDFListImpl
      * @return The index of the first occurrence of value in the list, or
      * <code>-1</code> if not found.
      */
+    @Override
     public int indexOf( RDFNode value ) {
         return indexOf( value, 0 );
     }
@@ -462,6 +475,7 @@ public class RDFListImpl
      * @exception ListIndexException if <code>start</code> is greater than the
      * length of the list.
      */
+    @Override
     public int indexOf( RDFNode value, int start ) {
         if (s_checkValid) {
             checkValid();
@@ -502,6 +516,7 @@ public class RDFListImpl
      * @return A new RDFList that contains all of this elements of this list,
      * followed by all of the elements of the given iterator.
      */
+    @Override
     public RDFList append( Iterator<? extends RDFNode> nodes ) {
         return append( copy( nodes) );
     }
@@ -520,6 +535,7 @@ public class RDFListImpl
      * @return A new RDFList that contains all of this elements of this list,
      * followed by all of the elements of the given list.
      */
+    @Override
     public RDFList append( RDFList list ) {
         if (s_checkValid) {
             checkValid();
@@ -555,6 +571,7 @@ public class RDFListImpl
      * @param list The argument list to concatenate to this list
      * @exception EmptyListUpdateException if this list is the nil list
      */
+    @Override
     public void concatenate( RDFList list ) {
         if (s_checkValid) {
             checkValid();
@@ -580,6 +597,7 @@ public class RDFListImpl
      * @exception EmptyListUpdateException if this list is the nil list
      * @see #concatenate(RDFList) for details on avoiding the empty list update exception.
      */
+    @Override
     public void concatenate( Iterator<? extends RDFNode> nodes ) {
         // make a list of the nodes and add to the end of this
         concatenate( copy( nodes ) );
@@ -594,6 +612,7 @@ public class RDFListImpl
      * 
      * @return A copy of the current list
      */
+    @Override
     public RDFList copy() {
         if (s_checkValid) {
             checkValid();
@@ -610,6 +629,7 @@ public class RDFListImpl
      * 
      * @param fn The function to apply to each list node.
      */
+    @Override
     public void apply( ApplyFn fn ) {
         if (s_checkValid) {
             checkValid();
@@ -632,6 +652,7 @@ public class RDFListImpl
      * @param initial The initial value for the accumulator
      * @return The final value of the accumulator.
      */
+    @Override
     public Object reduce( ReduceFn fn, Object initial ) {
         if (s_checkValid) {
             checkValid();
@@ -653,6 +674,7 @@ public class RDFListImpl
      * @param fn A Map function
      * @return The iterator of the elements of this list mapped with the given map function.
      */
+    @Override
     public <T> ExtendedIterator<T> mapWith( Map1<RDFNode, T> fn ) {
         return iterator().mapWith( fn );
     }
@@ -669,6 +691,7 @@ public class RDFListImpl
      * @return The remainder of the list after the head is removed (i&#046;e&#046; the
      * pre-removal list tail)
      */
+    @Override
     public RDFList removeHead() {
         if (s_checkValid) {
             checkValid();
@@ -694,6 +717,7 @@ public class RDFListImpl
      * @return The resulting list, which will be the same as the current list in most
      * cases, except when <code>val</code> occurs at the head of the list.
      */
+    @Override
     public RDFList remove( RDFNode val ) {
         if (s_checkValid) {
             checkValid();
@@ -734,6 +758,7 @@ public class RDFListImpl
      * again. Therefore, this method name has been deprecated in favour of {@link #removeList}</p>
      * @deprecated Replaced by {@link #removeList}
      */
+    @Override
     @Deprecated
     public void removeAll() {
         removeList();
@@ -756,6 +781,7 @@ public class RDFListImpl
      * referenced by the list - unless being the object of an <code>rdf:first</code>
      * statement is the only mention of that resource in the model.</p>
      */
+    @Override
     public void removeList() {
         for (Iterator<Statement> i = collectStatements().iterator(); i.hasNext(); ) {
             i.next().remove();
@@ -797,6 +823,7 @@ public class RDFListImpl
      * 
      * @return A closable iterator over the elements of the list.
      */
+    @Override
     public ExtendedIterator<RDFNode> iterator() {
         return new RDFListIterator( this );
     }
@@ -809,6 +836,7 @@ public class RDFListImpl
      * 
      * @return The contents of this list as a Java List.
      */
+    @Override
     public List<RDFNode> asJavaList() {
         List<RDFNode> l = new ArrayList<RDFNode>();
         
@@ -833,6 +861,7 @@ public class RDFListImpl
      * @return True if the given list and this list are the same length, and
      * contain equal elements in the same order.
      */
+    @Override
     public boolean sameListAs( RDFList list ) {
         if (s_checkValid) {
             checkValid();
@@ -874,6 +903,7 @@ public class RDFListImpl
      * 
      * @return True lists are being strictly checked.
      */
+    @Override
     public boolean getStrict() {
         return s_checkValid;
     }
@@ -889,6 +919,7 @@ public class RDFListImpl
      * 
      * @param strict The <b>static</b> flag for whether lists will be checked strictly.
      */
+    @Override
     public void setStrict( boolean strict ) {
         s_checkValid = strict;
     }
@@ -926,6 +957,7 @@ public class RDFListImpl
      * 
      * @return The most recent error message, or null.
      */
+    @Override
     public String getValidityErrorMessage() {
         return m_errorMsg;
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFReaderFImpl.java Wed Oct 19 11:47:05 2011
@@ -94,10 +94,12 @@ public class RDFReaderFImpl extends Obje
     public  RDFReaderFImpl() {
     }
 
+    @Override
     public RDFReader getReader()  {
         return getReader(DEFAULTLANG);
     }
 
+    @Override
     public RDFReader getReader(String lang)  {
 
         // setup default language
@@ -122,6 +124,7 @@ public class RDFReaderFImpl extends Obje
     }
 
 
+    @Override
     public String setReaderClassName( String lang,String className ) {
         return setBaseReaderClassName( lang, className );
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RDFWriterFImpl.java Wed Oct 19 11:47:05 2011
@@ -103,10 +103,12 @@ public class RDFWriterFImpl extends Obje
     public RDFWriterFImpl() {
     }
 
+    @Override
     public RDFWriter getWriter()  {
         return getWriter(DEFAULTLANG);
     }
 
+    @Override
     public RDFWriter getWriter(String lang)  {
 
         // setup default language
@@ -125,6 +127,7 @@ public class RDFWriterFImpl extends Obje
         }
     }
 
+    @Override
     public String setWriterClassName(String lang, String className) {
         String oldClassName = langToClassName.getProperty(lang);
         langToClassName.setProperty(lang, className);

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RSIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RSIteratorImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RSIteratorImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/RSIteratorImpl.java Wed Oct 19 11:47:05 2011
@@ -17,6 +17,7 @@ public class RSIteratorImpl extends Wrap
     public RSIteratorImpl( Iterator<ReifiedStatement> iterator )
         { super( iterator ); }
 
+    @Override
     public ReifiedStatement nextRS()
         { return next(); }
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifiedStatementImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifiedStatementImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifiedStatementImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifiedStatementImpl.java Wed Oct 19 11:47:05 2011
@@ -46,6 +46,7 @@ public class ReifiedStatementImpl extend
         answer [a .equals() version of] the Statement that this ReifiedStatement
         represents.
     */
+    @Override
     public Statement getStatement() 
         { return statement; }
        

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResIteratorImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResIteratorImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResIteratorImpl.java Wed Oct 19 11:47:05 2011
@@ -27,6 +27,7 @@ public class ResIteratorImpl extends Wra
     public ResIteratorImpl( Iterator<Resource> iter )
         { super( iter ); }
 
+    @Override
     public Resource nextResource() {
         return next();
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java Wed Oct 19 11:47:05 2011
@@ -97,15 +97,19 @@ public class ResourceImpl extends EnhNod
         this( Node.createURI( nameSpace + localName ), m );
     }
 
+    @Override
     public Object visitWith( RDFVisitor rv )
         { return isAnon() ? rv.visitBlank( this, getId() ) : rv.visitURI( this, getURI() ); }
         
+    @Override
     public Resource asResource()
         { return this; }
     
+    @Override
     public Literal asLiteral()
         { throw new LiteralRequiredException( asNode() ); }
     
+    @Override
     public Resource inModel( Model m )
         { 
         return 
@@ -118,21 +122,26 @@ public class ResourceImpl extends EnhNod
     private static Node fresh( String uri )
         { return uri == null ? Node.createAnon() : Node.createURI( uri ); }
 
+    @Override
     public AnonId getId() 
         { return asNode().getBlankNodeId(); }
 
+    @Override
     public String  getURI() {
         return isAnon() ? null : node.getURI();
     }
 
+    @Override
     public String getNameSpace() {
         return isAnon() ? null : node.getNameSpace();
     }
     
-	public String getLocalName() {
+	@Override
+    public String getLocalName() {
         return isAnon() ? null : node.getLocalName(); 
     }
 
+    @Override
     public boolean hasURI( String uri ) 
         { return node.hasURI( uri ); }
     
@@ -147,18 +156,23 @@ public class ResourceImpl extends EnhNod
 		return model;
 		}
 		    
+    @Override
     public Statement getRequiredProperty(Property p) 
     	{ return mustHaveModel().getRequiredProperty( this, p ); }
         
+    @Override
     public Statement getProperty( Property p )
         { return mustHaveModel().getProperty( this, p ); }
 
+    @Override
     public StmtIterator listProperties(Property p) 
 		{ return mustHaveModel().listStatements( this, p, (RDFNode) null ); }
 
+    @Override
     public StmtIterator listProperties() 
     	{ return mustHaveModel().listStatements( this, null, (RDFNode) null ); }	
     
+    @Override
     public Resource addLiteral( Property p, boolean o ) 
         {
         ModelCom m = mustHaveModel();
@@ -171,6 +185,7 @@ public class ResourceImpl extends EnhNod
         return this;
     }
     
+    @Override
     public Resource addLiteral( Property p, long o ) 
         {
         Model m = mustHaveModel();
@@ -178,6 +193,7 @@ public class ResourceImpl extends EnhNod
         return this;
         }
     
+    @Override
     public Resource addLiteral( Property p, char o )  
         {
         ModelCom m = mustHaveModel();
@@ -195,6 +211,7 @@ public class ResourceImpl extends EnhNod
         return this;
     }
     
+    @Override
     public Resource addLiteral( Property p, double o ) 
         {
         Model m = mustHaveModel();
@@ -202,6 +219,7 @@ public class ResourceImpl extends EnhNod
         return this;
         }
     
+    @Override
     public Resource addLiteral( Property p, float o ) 
         {
         Model m = mustHaveModel();
@@ -209,23 +227,27 @@ public class ResourceImpl extends EnhNod
         return this;
         }
 
+    @Override
     public Resource addProperty(Property p, String o) {
         mustHaveModel().add( this, p, o );
         return this;
     }
 
+    @Override
     public Resource addProperty(Property p, String o, String l)
     {
         mustHaveModel().add( this, p, o, l );
         return this;
     }
 
+    @Override
     public Resource addProperty(Property p, String lexicalForm, RDFDatatype datatype)
     {
         mustHaveModel().add(this, p, lexicalForm, datatype) ;
         return this ;
     }
 
+    @Override
     public Resource addLiteral( Property p, Object o ) 
         {
         ModelCom m = mustHaveModel();
@@ -233,95 +255,113 @@ public class ResourceImpl extends EnhNod
         return this;
         }
     
+    @Override
     public Resource addLiteral( Property p, Literal o )
         {
         mustHaveModel().add( this, p, o );
         return this;
         }
 
+    @Override
     public Resource addProperty( Property p, RDFNode o ) 
         {
         mustHaveModel().add( this, p, o );
         return this;
         }
 
+    @Override
     public boolean hasProperty(Property p)  {
         return mustHaveModel().contains( this, p );
     }
     
+    @Override
     public boolean hasLiteral( Property p, boolean o )  
         {
         ModelCom m = mustHaveModel();
         return m.contains( this, p, m.createTypedLiteral( o ) );
         }
     
+    @Override
     public boolean hasLiteral( Property p, long o ) 
         {
         ModelCom m = mustHaveModel();
         return m.contains( this, p, m.createTypedLiteral( o ) );
         }
     
+    @Override
     public boolean hasLiteral( Property p, char o )  
         {
         ModelCom m = mustHaveModel();
         return m.contains( this, p, m.createTypedLiteral( o ) );
         }
     
+    @Override
     public boolean hasLiteral( Property p, double o ) 
         {
         ModelCom m = mustHaveModel();
         return m.contains( this, p, m.createTypedLiteral( o ) );
         }
     
+    @Override
     public boolean hasLiteral( Property p, float o ) 
         {
         ModelCom m = mustHaveModel();
         return m.contains( this, p, m.createTypedLiteral( o ) );
         }
     
+    @Override
     public boolean hasProperty(Property p, String o) {
         return mustHaveModel().contains( this, p, o );
     }
 
+    @Override
     public boolean hasProperty(Property p, String o, String l) {
         return mustHaveModel().contains( this, p, o, l );
     }
 
+    @Override
     public boolean hasLiteral( Property p, Object o ) 
         {
         ModelCom m = mustHaveModel();
         return m.contains( this, p, m.createTypedLiteral( o ) );
         }
 
+    @Override
     public boolean hasProperty(Property p, RDFNode o)  {
         return mustHaveModel().contains( this, p, o );
     }
 
+    @Override
     public Resource removeProperties()  {
         removeAll(null);
         return this;
     }
     
+    @Override
     public Resource removeAll( Property p ) {
         mustHaveModel().removeAll( this, p, (RDFNode) null );
         return this;
     }
     
+    @Override
     public Resource begin()  {
         mustHaveModel().begin();
         return this;
     }
 
+    @Override
     public Resource abort()  {
         mustHaveModel().abort();
         return this;
     }
 
+    @Override
     public Resource commit()  {
         mustHaveModel().commit();
         return this;
     }
 
+    @Override
     public Model getModel() {
         return (Model) getGraph();
     }
@@ -329,6 +369,7 @@ public class ResourceImpl extends EnhNod
     protected ModelCom getModelCom()
         { return (ModelCom) getGraph(); }
 
+    @Override
     public Resource getPropertyResourceValue( Property p )
         {
         for (StmtIterator it = listProperties( p ); it.hasNext();)

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java Wed Oct 19 11:47:05 2011
@@ -50,135 +50,161 @@ public class SeqImpl extends ContainerIm
         super(n,g);
     }
     
+    @Override
     public Resource getResource(int index)  {
         return getRequiredProperty(RDF.li(index)).getResource();
     }
     
+    @Override
     public Literal getLiteral(int index)  {
         return getRequiredProperty(RDF.li(index)).getLiteral();
     }
     
+    @Override
     public RDFNode getObject(int index)  {
         return getRequiredProperty(RDF.li(index)).getObject();
     }
     
+    @Override
     public boolean getBoolean(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getBoolean();
     }
     
+    @Override
     public byte getByte(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getByte();
     }
     
+    @Override
     public short getShort(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getShort();
     }
     
+    @Override
     public int getInt(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getInt();
     }
     
+    @Override
     public long getLong(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getLong();
     }
     
+    @Override
     public char getChar(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getChar();
     }
     
+    @Override
     public float getFloat(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getFloat();
     }
     
+    @Override
     public double getDouble(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getDouble();
     }
     
+    @Override
     public String getString(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getString();
     }
     
+    @Override
     public String getLanguage(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getLanguage();
     }
     
+    @Override
     @Deprecated public Resource getResource(int index, ResourceF f) {
         return getRequiredProperty(RDF.li(index)).getResource(f);
     }
     
+    @Override
     public Bag getBag(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getBag();
     }
     
+    @Override
     public Alt getAlt(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getAlt();
     }
     
+    @Override
     public Seq getSeq(int index)  {
         checkIndex(index);
         return getRequiredProperty(RDF.li(index)).getSeq();
     }
 
+    @Override
     public Seq set(int index, RDFNode o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, boolean o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeLiteralObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, long o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeLiteralObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, float o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeLiteralObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, double o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeLiteralObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, char o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeLiteralObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, String o)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeObject(o);
         return this;
     }
     
+    @Override
     public Seq set(int index, String o, String l)  {
         checkIndex(index);
         getRequiredProperty(RDF.li(index)).changeObject(o, l);
         return this;
     }
     
+    @Override
     public Seq set(int index, Object o)  {
         checkIndex(index);
         Statement s = getRequiredProperty(RDF.li(index)) ;
@@ -190,38 +216,47 @@ public class SeqImpl extends ContainerIm
         return this;
     }
     
+    @Override
     public Seq add(int index, boolean o)  {
         return add( index, String.valueOf( o ) );
     }
     
+    @Override
     public Seq add(int index, long o)  {
         return add( index, String.valueOf( o ) );
     }
     
+    @Override
     public Seq add(int index, char o)  {
         return add( index, String.valueOf( o ) );
     }
     
+    @Override
     public Seq add(int index, float o)  {
         return add( index, String.valueOf( o ) );
     }
     
+    @Override
     public Seq add(int index, double o)  {
         return add( index, String.valueOf( o ) );
     }
     
+    @Override
     public Seq add(int index, Object o)  {
         return add( index, String.valueOf( o ) );
     }
     
+    @Override
     public Seq add(int index, String o)  {
         return add( index, o, "" );
     }
     
+    @Override
     public Seq add( int index, String o, String l )  {
         return add( index, literal( o, l ) );
     }
     
+    @Override
     public Seq add(int index, RDFNode o)  {
         int size = size();
         checkIndex(index, size+1);
@@ -244,6 +279,7 @@ public class SeqImpl extends ContainerIm
         return this;
     } 
     
+    @Override
     public Seq remove(int index)  {
         getRequiredProperty(RDF.li(index)).remove();
         shiftDown(index+1, size()+1);
@@ -256,38 +292,47 @@ public class SeqImpl extends ContainerIm
         return remove(getModel().createStatement(this, RDF.li(index), o).remove());
     }
     
+    @Override
     public int indexOf( RDFNode o )  {
         return containerIndexOf( o );
     }    
     
+    @Override
     public int indexOf(boolean o)  {
         return indexOf( String.valueOf( o ) );
     }
     
+    @Override
     public int indexOf(long o)  {
         return indexOf( String.valueOf( o ) );
     }
     
+    @Override
     public int indexOf(char o)  {
         return indexOf( String.valueOf( o ) );
     }
     
+    @Override
     public int indexOf(float o)  {
         return indexOf( String.valueOf( o ) );
     }
     
+    @Override
     public int indexOf(double o)  {
         return indexOf( String.valueOf( o ) );
     }
 
+    @Override
     public int indexOf(Object o)  {
         return indexOf( String.valueOf( o ) );
     }
         
+    @Override
     public int indexOf(String o)  {
         return indexOf( o, "" );
     }
     
+    @Override
     public int indexOf(String o, String l)  {
         return indexOf( literal( o, l ) );
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorFactoryImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorFactoryImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorFactoryImpl.java Wed Oct 19 11:47:05 2011
@@ -43,6 +43,7 @@ import java.util.Iterator;
  */
 public class SeqNodeIteratorFactoryImpl implements NodeIteratorFactory 
     {
+    @Override
     public NodeIterator createIterator( Iterator<Statement> iter, Object ignored, Container cont ) 
         { return new SeqNodeIteratorImpl( iter, (Seq) cont ); }
     }
\ No newline at end of file

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqNodeIteratorImpl.java Wed Oct 19 11:47:05 2011
@@ -70,6 +70,7 @@ public class SeqNodeIteratorImpl extends
         return stmt.getObject();
     }
     
+    @Override
     public RDFNode nextNode() {
         return next();
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementImpl.java Wed Oct 19 11:47:05 2011
@@ -73,7 +73,8 @@ public class StatementImpl  extends Stat
 		return object;
 		}
 
-	public Statement getStatementProperty( Property p )
+	@Override
+    public Statement getStatementProperty( Property p )
 		{
 		return asResource().getRequiredProperty( p );
 		}
@@ -82,9 +83,11 @@ public class StatementImpl  extends Stat
     public Resource getResource()
         { return mustBeResource( object ); }
     
+    @Override
     @Deprecated public Resource getResource( ResourceF f )
         { return f.createResource( getResource() ); }
     
+    @Override
     public Statement getProperty(Property p)  {
         return getResource().getRequiredProperty( p );
     }    
@@ -102,14 +105,17 @@ public class StatementImpl  extends Stat
         }
     }
         
+    @Override
     public Bag getBag()  {
         return object.as( Bag.class );
     }
     
+    @Override
     public Alt getAlt()  {
         return object.as( Alt.class );
     }
     
+    @Override
     public Seq getSeq()  {
         return object.as( Seq.class );
     }    
@@ -146,16 +152,19 @@ public class StatementImpl  extends Stat
     	return model.getAnyReifiedStatement(this);
     }    
 
+    @Override
     public Statement remove()
         {
         model.remove( this );
         return this;
         }
     
+    @Override
     public void removeReification() {
     	model.removeAllReifications(this);
     }
     
+    @Override
     public Triple asTriple() {
     	return Triple.create( subject.asNode(), predicate.asNode(), object.asNode() );
     }
@@ -173,6 +182,7 @@ public class StatementImpl  extends Stat
         return triples;
         }
     
+    @Override
     public boolean isReified()  {
         return model.isReified( this );
     }
@@ -180,6 +190,7 @@ public class StatementImpl  extends Stat
     /**
         create a ReifiedStatement corresponding to this Statement
     */
+    @Override
     public ReifiedStatement createReifiedStatement()
         { return ReifiedStatementImpl.create( this ); }
         
@@ -187,9 +198,11 @@ public class StatementImpl  extends Stat
         create a ReifiedStatement corresponding to this Statement
         and with the given _uri_.
     */
+    @Override
     public ReifiedStatement createReifiedStatement( String uri )
         { return ReifiedStatementImpl.create( (ModelCom) this.getModel(), uri, this ); }
         
+    @Override
     public RSIterator listReifiedStatements()
         { return model.listReifiedStatements( this ); }
 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StmtIteratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StmtIteratorImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StmtIteratorImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/rdf/model/impl/StmtIteratorImpl.java Wed Oct 19 11:47:05 2011
@@ -38,6 +38,7 @@ public class StmtIteratorImpl extends Wr
         current.remove();
         }
         
+    @Override
     public Statement nextStatement()
         { return next(); }
     }



Mime
View raw message