Return-Path: X-Original-To: apmail-incubator-jena-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-jena-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E25AE9E55 for ; Wed, 19 Oct 2011 11:49:25 +0000 (UTC) Received: (qmail 14244 invoked by uid 500); 19 Oct 2011 11:49:25 -0000 Delivered-To: apmail-incubator-jena-commits-archive@incubator.apache.org Received: (qmail 14219 invoked by uid 500); 19 Oct 2011 11:49:25 -0000 Mailing-List: contact jena-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jena-dev@incubator.apache.org Delivered-To: mailing list jena-commits@incubator.apache.org Received: (qmail 14212 invoked by uid 99); 19 Oct 2011 11:49:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 11:49:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2011 11:49:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0732D2388C10; Wed, 19 Oct 2011 11:48:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1186119 [11/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/ s... Date: Wed, 19 Oct 2011 11:47:53 -0000 To: jena-commits@incubator.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111019114817.0732D2388C10@eris.apache.org> Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/vocabulary/DAML_OIL.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/vocabulary/DAML_OIL.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/vocabulary/DAML_OIL.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/vocabulary/DAML_OIL.java Wed Oct 19 11:47:05 2011 @@ -324,168 +324,222 @@ public class DAML_OIL /** Answer the DAML namespace resource for the current release */ + @Override public Resource NAMESPACE_DAML() { return NAMESPACE_DAML; } /** Answer the RDF resource for DAML List class. */ + @Override public Resource List() { return List; } /** Answer the RDF resource for DAML UniqueProperty class */ + @Override public Resource UniqueProperty() { return UniqueProperty; } /** Answer the RDF resource for DAML TransitiveProperty class */ + @Override public Resource TransitiveProperty() { return TransitiveProperty; } /** Answer the RDF resource for DAML UnambiguousProperty class */ + @Override public Resource UnambiguousProperty() { return UnambiguousProperty; } /** Answer the RDF resource for DAML Restriction class */ + @Override public Resource Restriction() { return Restriction; } /** Answer the RDF resource for DAML Ontology class */ + @Override public Resource Ontology() { return Ontology; } /** Answer the RDF resource for the nil (empty) list. */ + @Override public Resource nil() { return nil; } /** Answer the RDF resource for the top type (i.e. the super-type of all types). */ + @Override public Resource Thing() { return Thing; } /** Answer the RDF resource for the bottom type (i.e. the super-type of no types). */ + @Override public Resource Nothing() { return Nothing; } /** Answer the Alias for rdfs:Literal in the daml namespace. */ + @Override public Resource Literal() { return Literal; } /** Answer the RDF resource for DAML Class class (a DAML sub-class of rdfs:Class). */ + @Override public Resource Class() { return Class; } /** Answer the RDF resource for DAML Datatype class (a DAML sub-class of rdfs:Class). */ + @Override public Resource Datatype() { return Datatype; } /** Answer the RDF resource for DAML DatatypeProperty class (a DAML sub-class of rdf:Property). */ + @Override public Resource DatatypeProperty() { return DatatypeProperty; } /** Answer the RDF resource for DAML ObjectProperty class (a DAML sub-class of rdf:Property). */ + @Override public Resource ObjectProperty() { return ObjectProperty; } /* Properties */ /** Answer the RDF Property for the DAML versionInfo property */ + @Override public Property versionInfo() { return versionInfo; } /** Answer the RDF Property for the DAML imports property on Ontologies */ + @Override public Property imports() { return imports; } /** Answer the RDF Property for the DAML disjointWith property on Classes */ + @Override public Property disjointWith() { return disjointWith; } /** Answer the RDF Property for the DAML disjointUnionOf property on Classes */ + @Override public Property disjointUnionOf() { return disjointUnionOf; } /** Answer the RDF Property for the DAML sameClassAs property on Classes */ + @Override public Property sameClassAs() { return sameClassAs; } /** Answer the RDF Property for the DAML samePropertyAs property on Properties */ + @Override public Property samePropertyAs() { return samePropertyAs; } /** Answer the RDF Property for the oneOf property on DAML class expressions */ + @Override public Property oneOf() { return oneOf; } /** Answer the RDF Property for the intersectionOf property on class expressions */ + @Override public Property intersectionOf() { return intersectionOf; } /** Answer the RDF Property for the unionOf property on class expressions */ + @Override public Property unionOf() { return unionOf; } /** Answer the RDF Property for the complementOf property on class expressions */ + @Override public Property complementOf() { return complementOf; } /** Answer the RDF Property for the equivalentTo property on DAML values */ + @Override public Property equivalentTo() { return equivalentTo; } /** Answer the RDF Property for the DAML onProperty property on Restrictions */ + @Override public Property onProperty() { return onProperty; } /** Answer the RDF Property for the DAML toClass property on Restrictions */ + @Override public Property toClass() { return toClass; } /** Answer the RDF Property for the DAML hasValue property on Restrictions */ + @Override public Property hasValue() { return hasValue; } /** Answer the RDF Property for the DAML hasClass property on Restrictions */ + @Override public Property hasClass() { return hasClass; } /** Answer the RDF Property for the DAML hasClassQ property on Restrictions */ + @Override public Property hasClassQ() { return hasClassQ; } /** Answer the RDF Property for the DAML cardinality property on Restrictions */ + @Override public Property cardinality() { return cardinality; } /** Answer the RDF Property for the DAML minCardinality property on Restrictions */ + @Override public Property minCardinality() { return minCardinality; } /** Answer the RDF Property for the DAML maxCardinality property on Restrictions */ + @Override public Property maxCardinality() { return maxCardinality; } /** Answer the RDF Property for the DAML cardinalityQ property on Restrictions */ + @Override public Property cardinalityQ() { return cardinalityQ; } /** Answer the RDF Property for the DAML minCardinalityQ property on Restrictions */ + @Override public Property minCardinalityQ() { return minCardinalityQ; } /** Answer the RDF Property for the DAML maxCardinalityQ property on Restrictions */ + @Override public Property maxCardinalityQ() { return maxCardinalityQ; } /** Answer the RDF Property for the DAML inverseOf property on Properties */ + @Override public Property inverseOf() { return inverseOf; } /** Answer the RDF Property for the DAML first property on Lists */ + @Override public Property first() { return first; } /** Answer the RDF Property for the DAML rest property on Lists */ + @Override public Property rest() { return rest; } /** Answer the RDF Property for the DAML item property on Lists */ + @Override public Property item() { return item; } /** Answer the alias for rdfs:subPropertyOf in daml namespace */ + @Override public Property subPropertyOf() { return subPropertyOf; } /** Answer the alias for rdf:type in daml namespace */ + @Override public Property type() { return type; } /** Answer the alias for rdf:value in daml namespace */ + @Override public Property value() { return value; } /** Answer the alias for rdfs:subClassOf in daml namespace */ + @Override public Property subClassOf() { return subClassOf; } /** Answer the alias for rdfs:domain in daml namespace */ + @Override public Property domain() { return domain; } /** Answer the alias for rdfs:range in daml namespace */ + @Override public Property range() { return range; } /** Answer the alias for rdfs:label in daml namespace */ + @Override public Property label() { return label; } /** Answer the alias for rdfs:comment in daml namespace */ + @Override public Property comment() { return comment; } /** Answer the alias for rdfs:seeAlso in daml namespace */ + @Override public Property seeAlso() { return seeAlso; } /** Answer the alias for rdfs:isDefinedBy in daml namespace */ + @Override public Property isDefinedBy() { return isDefinedBy; } /** Answer the RDF Property for the DAML sameIndividualAs property on instances */ + @Override public Property sameIndividualAs() { return sameIndividualAs; } /** Answer the RDF Property for the DAML differentIndvidualFrom property on instances */ + @Override public Property differentIndividualFrom() { return differentIndividualFrom; } /** Answer the alias for rdfs:Property in the daml namespace. From 2001/03 onwards, it is preferable to use either DatatypeProperty or ObjectProperty. */ + @Override public Resource Property() { return Property; } Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/RDFXMLWriterI.java Wed Oct 19 11:47:05 2011 @@ -218,7 +218,8 @@ This is a list of * @return the old value for this property, or null * if no value was set. */ - Object setProperty( + @Override +Object setProperty( String propName, Object propValue); Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Abbreviated.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Abbreviated.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Abbreviated.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Abbreviated.java Wed Oct 19 11:47:05 2011 @@ -144,15 +144,18 @@ public class Abbreviated extends BaseXML } // Implemenatation of RDFErrorHandler - public void error(Exception e) { + @Override + public void error(Exception e) { errorHandler.error(e); } - public void warning(Exception e) { + @Override + public void warning(Exception e) { errorHandler.warning(e); } - public void fatalError(Exception e) { + @Override + public void fatalError(Exception e) { errorHandler.fatalError(e); } Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java Wed Oct 19 11:47:05 2011 @@ -92,10 +92,12 @@ abstract public class BaseXMLWriter impl private static Logger xlogger = LoggerFactory.getLogger( BaseXMLWriter.class ); protected static SimpleLogger logger = new SimpleLogger() { - public void warn(String s) { + @Override + public void warn(String s) { xlogger.warn(s); } - public void warn(String s, Exception e) { + @Override + public void warn(String s, Exception e) { xlogger.warn(s,e); } }; @@ -454,7 +456,8 @@ abstract public class BaseXMLWriter impl * @param out the OutputStream to receive the serialization * @param base The URL at which the file will be placed. */ - final public void write(Model model, OutputStream out, String base) + @Override + final public void write(Model model, OutputStream out, String base) { write( model, FileUtils.asUTF8(out), base ); } /** Serialize Model model to Writer out. @@ -463,7 +466,8 @@ abstract public class BaseXMLWriter impl * @param base the base URI for relative URI calculations. * null means use only absolute URI's. */ - synchronized public void write(Model baseModel, Writer out, String base) + @Override + synchronized public void write(Model baseModel, Writer out, String base) { Model model = ModelFactory.withHiddenStatements( baseModel ); setupNamespaces( baseModel, model ); @@ -593,7 +597,8 @@ abstract public class BaseXMLWriter impl * @param errHandler The new error handler to be used, or null for the default handler. * @return the old error handler */ - synchronized public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler) { + @Override + synchronized public RDFErrorHandler setErrorHandler(RDFErrorHandler errHandler) { // null means no user defined error handler. // We implement this using defaultErrorHandler, // but hide this fact from the user. @@ -637,7 +642,8 @@ abstract public class BaseXMLWriter impl @see com.hp.hpl.jena.rdf.model.RDFWriter#setProperty(java.lang.String, java.lang.Object) */ - final synchronized public Object setProperty( String propName, Object propValue ) { + @Override + final synchronized public Object setProperty( String propName, Object propValue ) { if (propName.equalsIgnoreCase("showXmlDeclaration")) { return setShowXmlDeclaration(propValue); } else if (propName.equalsIgnoreCase( "showDoctypeDeclaration" )) { Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/PairEntry.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/PairEntry.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/PairEntry.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/PairEntry.java Wed Oct 19 11:47:05 2011 @@ -46,9 +46,11 @@ class PairEntry implements java.ut return false; } + @Override public K getKey() { return a; } + @Override public V getValue() { return b; } @@ -56,6 +58,7 @@ class PairEntry implements java.ut public int hashCode() { return a.hashCode() ^ b.hashCode(); } + @Override public V setValue(Object value) { throw new UnsupportedOperationException(); } Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Relation.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Relation.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Relation.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Relation.java Wed Oct 19 11:47:05 2011 @@ -193,6 +193,7 @@ class Relation { private static Map1> inner(final X a) { return new Map1>() { + @Override public PairEntry map1(X b) { return new PairEntry(a, b) ; @@ -225,6 +226,7 @@ class Relation { Map1>, Iterator>> m1 = new Map1>, Iterator>>(){ + @Override public Iterator> map1(Entry> entry) { return pairEntry(entry) ; Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Unparser.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Unparser.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Unparser.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/xmloutput/impl/Unparser.java Wed Oct 19 11:47:05 2011 @@ -135,6 +135,7 @@ class Unparser { res2statement = new HashMap(); statement2res = new HashMap(); ClosableIterator reified = new MapFilterIterator(new MapFilter() { + @Override public Resource accept(Resource o) { Resource r = o; return (r.hasProperty(RDF.subject) @@ -1253,6 +1254,7 @@ class Unparser { (!r.isAnon()) && isLocalReference(r) && res2statement.containsKey(r)) { ss = new MapFilterIterator(new MapFilter() { + @Override public Statement accept(Statement o) { Statement s = o; Property p = s.getPredicate(); @@ -1272,6 +1274,7 @@ class Unparser { private ExtendedIterator listProperties(Resource r) { return new MapFilterIterator(new MapFilter() { + @Override public Statement accept( Statement o ) { return doneSet.contains(o) ? null : o; } @@ -1560,6 +1563,7 @@ class Unparser { Map1, Iterator> mapper = new Map1, Iterator>() { + @Override public Iterator map1(Set bkt) { return bkt.iterator() ; Modified: incubator/jena/Jena2/jena/trunk/src/main/java/jena/RuleMap.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/jena/RuleMap.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/jena/RuleMap.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/jena/RuleMap.java Wed Oct 19 11:47:05 2011 @@ -86,6 +86,7 @@ public class RuleMap { * Return a name for this builtin, normally this will be the name of the * functor that will be used to invoke it. */ + @Override public String getName() { return "deduce"; } Modified: incubator/jena/Jena2/jena/trunk/src/main/java/jena/cmdline/CommandLine.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/jena/cmdline/CommandLine.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/jena/cmdline/CommandLine.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/jena/cmdline/CommandLine.java Wed Oct 19 11:47:05 2011 @@ -423,6 +423,7 @@ public class CommandLine final PrintStream _out = System.err ; return new ArgHandler() { + @Override public void action (String arg, String val) //throws java.lang.IllegalArgumentException { if ( _out != null ) Modified: incubator/jena/Jena2/jena/trunk/src/main/java/jena/rdfcat.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/jena/rdfcat.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/jena/rdfcat.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/jena/rdfcat.java Wed Oct 19 11:47:05 2011 @@ -134,6 +134,7 @@ public class rdfcat /** Argument setting expected input language to N3 */ public final ArgDecl IN_N3 = new ArgDecl( true, "n", "n3", "ttl", "N3", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { m_actionQ.add( new ReadAction( val, "N3") ); }} ); @@ -141,6 +142,7 @@ public class rdfcat /** Argument setting expected input language to RDF/XML */ public final ArgDecl IN_RDF_XML = new ArgDecl( true, "x", "xml", "rdfxml", "rdf", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { m_actionQ.add( new ReadAction( val, "RDF/XML") ); }} ); @@ -148,6 +150,7 @@ public class rdfcat /** Argument setting expected input language to NTRIPLE */ public final ArgDecl IN_NTRIPLE = new ArgDecl( true, "t", "ntriples", "ntriple", "n-triple", "n-triples", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { m_actionQ.add( new ReadAction( val, "N-TRIPLE" ) ); }} ); @@ -155,6 +158,7 @@ public class rdfcat /** Argument to set the output language */ public final ArgDecl OUT_LANG = new ArgDecl( true, "out", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { setOutput( val ); }} ); @@ -162,6 +166,7 @@ public class rdfcat /** Argument to set the default input language */ public final ArgDecl IN_LANG = new ArgDecl( true, "in", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { expectInput( val ); }} ); @@ -169,6 +174,7 @@ public class rdfcat /** Argument to turn include processing on */ public final ArgDecl INCLUDE = new ArgDecl( false, "include", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { setInclude( true ); }} ); @@ -176,6 +182,7 @@ public class rdfcat /** Argument to turn include processing off */ public final ArgDecl NOINCLUDE = new ArgDecl( false, "noinclude", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { setInclude( false ); }} ); @@ -183,6 +190,7 @@ public class rdfcat /** Argument to leave import/seeAlso statements in place in flattened models */ public final ArgDecl NOFILTER = new ArgDecl( false, "nofilter", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { setRemoveIncludeStatements( false ); }} ); @@ -190,11 +198,13 @@ public class rdfcat /** Argument to show usage */ public final ArgDecl HELP = new ArgDecl( false, "help", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { usage(); }} ); public final ArgDecl USAGE = new ArgDecl( false, "usage", new ArgHandler() { + @Override public void action( String arg, String val ) throws IllegalArgumentException { usage(); }} ); @@ -538,6 +548,7 @@ public class rdfcat } /** perform the action of reading a uri */ + @Override public void run( rdfcat rc ) { String l = rc.getExpectedInput(); if (m_lang != null) { Modified: incubator/jena/Jena2/jena/trunk/src/main/java/jena/schemagen.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/jena/schemagen.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/main/java/jena/schemagen.java (original) +++ incubator/jena/Jena2/jena/trunk/src/main/java/jena/schemagen.java Wed Oct 19 11:47:05 2011 @@ -942,6 +942,7 @@ public class schemagen { // collect the classes to list List classes = m_source.listStatements( null, RDF.type, cls ).mapWith( new Map1() { + @Override public Resource map1( Statement s ) { return s.getSubject(); }} @@ -1278,6 +1279,7 @@ public class schemagen { /** Answer an iterator that contains the elements of the given iterator, but sorted by URI */ protected ExtendedIterator sorted( List members ) { Collections.sort( members, new Comparator() { + @Override public int compare( RDFNode n0, RDFNode n1 ) { if (n0.isLiteral() || n1.isLiteral()) { if (n0.isLiteral() && n1.isLiteral()) { @@ -1691,69 +1693,133 @@ public class schemagen { // External interface methods + @Override public boolean hasConfigFileOption() { return hasValue( OPT.CONFIG_FILE ); } + @Override public String getConfigFileOption() { return getStringValue( OPT.CONFIG_FILE ); } + @Override public boolean hasRootOption() { return hasValue( OPT.ROOT ); } + @Override public String getRootOption() { return getStringValue( OPT.ROOT ); } + @Override public boolean hasNoCommentsOption() { return isTrue( OPT.NO_COMMENTS ); } + @Override public String getNoCommentsOption() { return getStringValue( OPT.NO_COMMENTS ); } + @Override public boolean hasInputOption() { return hasValue( OPT.INPUT ); } + @Override public Resource getInputOption() { return getResource( OPT.INPUT ); } + @Override public boolean hasLangDamlOption() { return isTrue( OPT.LANG_DAML ); } + @Override public String getLangDamlOption() { return getStringValue( OPT.LANG_DAML ); } + @Override public boolean hasLangOwlOption() { return isTrue( OPT.LANG_OWL ); } + @Override public String getLangOwlOption() { return getStringValue( OPT.LANG_OWL ); } + @Override public boolean hasLangRdfsOption() { return isTrue( OPT.LANG_RDFS ); } + @Override public String getLangRdfsOption() { return getStringValue( OPT.LANG_RDFS ); } + @Override public boolean hasOutputOption() { return hasValue( OPT.OUTPUT ); } + @Override public String getOutputOption() { return getStringValue( OPT.OUTPUT ); } + @Override public boolean hasHeaderOption() { return isTrue( OPT.HEADER ); } + @Override public String getHeaderOption() { return getStringValue( OPT.HEADER ); } + @Override public boolean hasFooterOption() { return isTrue( OPT.FOOTER ); } + @Override public String getFooterOption() { return getStringValue( OPT.FOOTER ); } + @Override public boolean hasMarkerOption() { return hasValue( OPT.MARKER ); } + @Override public String getMarkerOption() { return getStringValue( OPT.MARKER ); } + @Override public boolean hasPackagenameOption() { return hasValue( OPT.PACKAGENAME ); } + @Override public String getPackagenameOption() { return getStringValue( OPT.PACKAGENAME ); } + @Override public boolean hasOntologyOption() { return isTrue( OPT.ONTOLOGY ); } + @Override public String getOntologyOption() { return getStringValue( OPT.ONTOLOGY ); } + @Override public boolean hasClassnameOption() { return hasValue( OPT.CLASSNAME ); } + @Override public String getClassnameOption() { return getStringValue( OPT.CLASSNAME ); } + @Override public boolean hasClassdecOption() { return hasValue( OPT.CLASSDEC ); } + @Override public String getClassdecOption() { return getStringValue( OPT.CLASSDEC ); } + @Override public boolean hasNamespaceOption() { return hasValue( OPT.NAMESPACE ); } + @Override public Resource getNamespaceOption() { return getResource( OPT.NAMESPACE ); } + @Override public boolean hasDeclarationsOption() { return hasValue( OPT.DECLARATIONS ); } + @Override public String getDeclarationsOption() { return getStringValue( OPT.DECLARATIONS ); } + @Override public boolean hasPropertySectionOption() { return hasValue( OPT.PROPERTY_SECTION ); } + @Override public String getPropertySectionOption() { return getStringValue( OPT.PROPERTY_SECTION ); } + @Override public boolean hasClassSectionOption() { return hasValue( OPT.CLASS_SECTION ); } + @Override public String getClassSectionOption() { return getStringValue( OPT.CLASS_SECTION ); } + @Override public boolean hasIndividualsSectionOption() { return hasValue( OPT.INDIVIDUALS_SECTION ); } + @Override public String getIndividualsSectionOption() { return getStringValue( OPT.INDIVIDUALS_SECTION ); } + @Override public boolean hasNopropertiesOption() { return isTrue( OPT.NOPROPERTIES ); } + @Override public boolean hasNoclassesOption() { return isTrue( OPT.NOCLASSES ); } + @Override public boolean hasNoindividualsOption() { return isTrue( OPT.NOINDIVIDUALS ); } + @Override public boolean hasPropTemplateOption() { return hasValue( OPT.PROP_TEMPLATE ); } + @Override public String getPropTemplateOption() { return getStringValue( OPT.PROP_TEMPLATE ); } + @Override public boolean hasClassTemplateOption() { return hasValue( OPT.CLASS_TEMPLATE ); } + @Override public String getClassTemplateOption() { return getStringValue( OPT.CLASS_TEMPLATE ); } + @Override public boolean hasIndividualTemplateOption() { return hasValue( OPT.INDIVIDUAL_TEMPLATE ); } + @Override public String getIndividualTemplateOption() { return getStringValue( OPT.INDIVIDUAL_TEMPLATE ); } + @Override public boolean hasUcNamesOption() { return isTrue( OPT.UC_NAMES ); } + @Override public boolean hasIncludeOption() { return hasValue( OPT.INCLUDE ); } + @Override public List getIncludeOption() { return getAllValues( OPT.INCLUDE ); } + @Override public boolean hasClassnameSuffixOption() { return hasValue( OPT.CLASSNAME_SUFFIX ); } + @Override public String getClassnameSuffixOption() { return getStringValue( OPT.CLASSNAME_SUFFIX ); } + @Override public boolean hasNoheaderOption() { return isTrue( OPT.NOHEADER ); } + @Override public boolean hasEncodingOption() { return hasValue( OPT.ENCODING ); } + @Override public String getEncodingOption() { return getStringValue( OPT.ENCODING ); } + @Override public boolean hasHelpOption() { return hasValue( OPT.HELP ); } + @Override public String getHelpOption() { return getStringValue( OPT.HELP ); } + @Override public boolean hasDosOption() { return isTrue( OPT.DOS ); } + @Override public boolean hasUseInfOption() { return isTrue( OPT.USE_INF ); } + @Override public boolean hasStrictIndividualsOption() { return isTrue( OPT.STRICT_INDIVIDUALS ); } + @Override public boolean hasIncludeSourceOption() { return isTrue( OPT.INCLUDE_SOURCE ); } + @Override public boolean hasNoStrictOption() { return isTrue( OPT.NO_STRICT ); } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestInfModelAssembler.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestInfModelAssembler.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestInfModelAssembler.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestInfModelAssembler.java Wed Oct 19 11:47:05 2011 @@ -54,12 +54,15 @@ public class TestInfModelAssembler exten { return new ReasonerFactory() { + @Override public Reasoner create( Resource configuration ) { return R; } + @Override public Model getCapabilities() { throw new RuntimeException( "mock doesn't do getCapabilities" ); } + @Override public String getURI() { throw new RuntimeException( "mock doesn't do getURI" ); } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestOntModelSpecAssembler.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestOntModelSpecAssembler.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestOntModelSpecAssembler.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestOntModelSpecAssembler.java Wed Oct 19 11:47:05 2011 @@ -156,8 +156,10 @@ public class TestOntModelSpecAssembler e Assembler a = new OntModelSpecAssembler(); ModelGetter getter = new ModelGetter() { + @Override public Model getModel( String URL ) { return null; } + @Override public Model getModel( String URL, ModelReader loadIfAbsent ) { throw new CannotCreateException( URL ); } }; @@ -169,12 +171,15 @@ public class TestOntModelSpecAssembler e private static final class FakeReasonerFactory implements ReasonerFactory { + @Override public Reasoner create( Resource configuration ) { return null; } + @Override public Model getCapabilities() { return null; } + @Override public String getURI() { return null; } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestReasonerFactoryAssembler.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestReasonerFactoryAssembler.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestReasonerFactoryAssembler.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/assembler/test/TestReasonerFactoryAssembler.java Wed Oct 19 11:47:05 2011 @@ -58,12 +58,15 @@ public class TestReasonerFactoryAssemble public static class MockBase implements ReasonerFactory { + @Override public Reasoner create( Resource configuration ) { return null; } + @Override public Model getCapabilities() { return null; } + @Override public String getURI() { return null; } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestAllImpl.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestAllImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestAllImpl.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestAllImpl.java Wed Oct 19 11:47:05 2011 @@ -41,18 +41,22 @@ public class TestAllImpl extends TestCom ; } + @Override public boolean isObject() { return findObject() != null; } + @Override public boolean isProperty() { return findPredicate() != null; } + @Override public boolean isSubject() { return findSubject() != null; } + @Override public TestObject anObject() { if (!isProperty()) @@ -60,12 +64,14 @@ public class TestAllImpl extends TestCom return enhGraph.getNodeAs(findPredicate().getObject(),TestObject.class); } + @Override public TestProperty aProperty() { if (!isSubject()) throw new IllegalStateException("Node is not the subject of a triple."); return enhGraph.getNodeAs(findSubject().getPredicate(),TestProperty.class); } + @Override public TestSubject aSubject() { if (!isObject()) throw new IllegalStateException("Node is not the object of a triple."); Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestCommonImpl.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestCommonImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestCommonImpl.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestCommonImpl.java Wed Oct 19 11:47:05 2011 @@ -57,14 +57,17 @@ class TestCommonImpl extends EnhNode imp // Convenience routines, that wrap the generic // routines from EnhNode. + @Override public TestSubject asSubject() { return asInternal(TestSubject.class); } + @Override public TestObject asObject() { return asInternal(TestObject.class); } + @Override public TestProperty asProperty() { return asInternal(TestProperty.class); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestModelImpl.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestModelImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestModelImpl.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestModelImpl.java Wed Oct 19 11:47:05 2011 @@ -32,14 +32,17 @@ public class TestModelImpl extends EnhGr { if (it != null) it.close(); } } + @Override public TestObject anObject() { return getNodeAs(aTriple().getObject(),TestObject.class); } + @Override public TestProperty aProperty() { return getNodeAs(aTriple().getPredicate(),TestProperty.class); } + @Override public TestSubject aSubject() { return getNodeAs(aTriple().getSubject(),TestSubject.class); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestObjectImpl.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestObjectImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestObjectImpl.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestObjectImpl.java Wed Oct 19 11:47:05 2011 @@ -41,6 +41,7 @@ public class TestObjectImpl extends Test @Override public boolean supports( Class t ) { return t.isInstance( this ) && isObject(); } + @Override public boolean isObject() { return findObject() != null; } @@ -53,6 +54,7 @@ public class TestObjectImpl extends Test * * @see com.hp.hpl.jena.enhanced.test.TestObject#aSubject() */ + @Override public TestSubject aSubject() { if (!isObject()) throw new IllegalStateException("Node is not the object of a triple."); Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java Wed Oct 19 11:47:05 2011 @@ -379,18 +379,23 @@ public class TestPackage extends GraphTe { return n.isURI(); } }; + @Override public RDFNode inModel( Model m ) { return null; } + @Override public Model getModel() { throw new JenaException( "getModel() should not be called in the EnhGraph/Node tests" ); } + @Override public Resource asResource() { throw new JenaException( "asResource() should not be called in the EnhGraph/Node tests" ); } + @Override public Literal asLiteral() { throw new JenaException( "asLiteral() should not be called in the EnhGraph/Node tests" ); } + @Override public Object visitWith( RDFVisitor rv ) { return null; } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPropertyImpl.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPropertyImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPropertyImpl.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestPropertyImpl.java Wed Oct 19 11:47:05 2011 @@ -32,10 +32,12 @@ public class TestPropertyImpl extends T @Override public boolean supports( Class t ) { return t.isInstance( this ) && isProperty(); } + @Override public boolean isProperty() { return findPredicate() != null; } + @Override public TestObject anObject() { if (!isProperty()) throw new IllegalStateException("Node is not the property of a triple."); Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestSubjectImpl.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestSubjectImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestSubjectImpl.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/enhanced/test/TestSubjectImpl.java Wed Oct 19 11:47:05 2011 @@ -33,10 +33,12 @@ public class TestSubjectImpl extends Tes @Override public boolean supports( Class t ) { return t.isInstance( this ) && isSubject(); } + @Override public boolean isSubject() { return findSubject() != null; } + @Override public TestProperty aProperty() { if (!isSubject()) throw new IllegalStateException("Node is not the subject of a triple."); Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/compose/test/TestUnionStatistics.java Wed Oct 19 11:47:05 2011 @@ -92,6 +92,7 @@ public class TestUnionStatistics extends { return new GraphStatisticsHandler() { + @Override public long getStatistic( Node S, Node P, Node O ) { return x.value; } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/AbstractTestQuery.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/AbstractTestQuery.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/AbstractTestQuery.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/AbstractTestQuery.java Wed Oct 19 11:47:05 2011 @@ -620,8 +620,11 @@ public abstract class AbstractTestQuery protected String modifiers = ""; public PL( String content ) { super( content ); } public PL( String content, String modifiers ) { super( content ); this.modifiers = modifiers; } + @Override public String getPatternString() { return (String) value; } + @Override public String getPatternModifiers() { return modifiers; } + @Override public String getPatternLanguage() { return rdql; } } @@ -668,6 +671,7 @@ public abstract class AbstractTestQuery { return new TripleSorter() { + @Override public Triple [] sort( Triple [] triples ) { return new Triple[] {triples[a], triples[b], triples[c]}; } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTestBase.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTestBase.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTestBase.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/QueryTestBase.java Wed Oct 19 11:47:05 2011 @@ -72,7 +72,8 @@ public abstract class QueryTestBase exte protected Map1 select( final int index ) { return new Map1() - { public Node map1( Domain o ) { return o.get( index ); } }; + { @Override + public Node map1( Domain o ) { return o.get( index ); } }; } /** @@ -88,7 +89,8 @@ public abstract class QueryTestBase exte public String getName() { return x.getName(); } - public Valuator prepare( VariableIndexes vi ) + @Override + public Valuator prepare( VariableIndexes vi ) { return new SlotValuator( vi.indexOf( x.getName() ) ); } }; return new Expression.Fixed( x ); @@ -99,13 +101,15 @@ public abstract class QueryTestBase exte assumes the elements are lists and extracts their first elements. */ protected static Map1 getFirst = new Map1() - { public Node map1( Domain x ) { return x.get(0); } }; + { @Override + public Node map1( Domain x ) { return x.get(0); } }; /** An IndexValues with no elements - ever slot maps to null */ protected static final IndexValues noIVs = new IndexValues() - { public Object get( int i ) { return null; } }; + { @Override + public Object get( int i ) { return null; } }; /** A mapping with no elements pre-defined @@ -117,7 +121,8 @@ public abstract class QueryTestBase exte are defined (all names map to the non-existant slot -1). */ protected VariableIndexes noVariables = new VariableIndexes() - { public int indexOf( String name ) { return -1; } }; + { @Override + public int indexOf( String name ) { return -1; } }; /** A Node with spelling "X". Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressionConstraints.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressionConstraints.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressionConstraints.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressionConstraints.java Wed Oct 19 11:47:05 2011 @@ -103,6 +103,7 @@ public class TestExpressionConstraints e public VI set( String x, int i ) { values.put( x, new Integer( i ) ); return this; } + @Override public int indexOf( String name ) { return values.get( name ).intValue(); } } @@ -112,6 +113,7 @@ public class TestExpressionConstraints e public IV set( int i, String x ) { values.put( new Integer( i ), Node.createLiteral( x ) ); return this; } + @Override public Object get( int i ) { return values.get( new Integer( i ) ); } } @@ -179,7 +181,8 @@ public class TestExpressionConstraints e public void testUnknownExpression() { Expression eOpaque = new Expression.Base() - { public Valuator prepare(VariableIndexes vi) + { @Override + public Valuator prepare(VariableIndexes vi) { return null; } }; assertFalse( Util.containsAllVariablesOf( new HashSet(), eOpaque ) ); Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressions.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressions.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressions.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestExpressions.java Wed Oct 19 11:47:05 2011 @@ -249,12 +249,15 @@ public class TestExpressions extends Que { return new PatternLiteral() { + @Override public String getPatternString() { return c; } + @Override public String getPatternModifiers() { return m; } + @Override public String getPatternLanguage() { return rdql; } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestStageElements.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestStageElements.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestStageElements.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/query/test/TestStageElements.java Wed Oct 19 11:47:05 2011 @@ -47,23 +47,28 @@ public class TestStageElements extends Q { public Domain lastPut; + @Override public boolean hasNext() { return false; } + @Override public Domain get() { return null; } + @Override public void put( Domain d ) { lastPut = d; } + @Override public void close() { } + @Override public void close( Exception e ) { } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestGraph.java Wed Oct 19 11:47:05 2011 @@ -261,7 +261,8 @@ public/* abstract */class AbstractTestGr try { th.begin(); th.commit(); } catch (UnsupportedOperationException x) {} /* */ Command cmd = new Command() - { public Object execute() { return null; } }; + { @Override + public Object execute() { return null; } }; try { th.executeInTransaction( cmd ); } catch (UnsupportedOperationException x) {} } @@ -272,7 +273,8 @@ public/* abstract */class AbstractTestGr if (th.transactionsSupported()) { Command cmd = new Command() - { public Object execute() throws Error { throw new Error(); } }; + { @Override + public Object execute() throws Error { throw new Error(); } }; try { th.executeInTransaction( cmd ); } catch (JenaException x) {} } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/RecordingListener.java Wed Oct 19 11:47:05 2011 @@ -19,36 +19,47 @@ public class RecordingListener implement { public List history = new ArrayList(); + @Override public void notifyAddTriple( Graph g, Triple t ) { record( "add", g, t ); } + @Override public void notifyAddArray( Graph g, Triple [] triples ) { record( "add[]", g, triples ); } + @Override public void notifyAddList( Graph g, List triples ) { record( "addList", g, triples ); } + @Override public void notifyAddIterator( Graph g, Iterator it ) { record( "addIterator", g, GraphTestBase.iteratorToList( it ) ); } + @Override public void notifyAddGraph( Graph g, Graph added ) { record( "addGraph", g, added ); } + @Override public void notifyDeleteTriple( Graph g, Triple t ) { record( "delete", g, t ); } + @Override public void notifyDeleteArray( Graph g, Triple [] triples ) { record( "delete[]", g, triples ); } + @Override public void notifyDeleteList( Graph g, List triples ) { record( "deleteList", g, triples ); } + @Override public void notifyDeleteIterator( Graph g, Iterator it ) { record( "deleteIterator", g, GraphTestBase.iteratorToList( it ) ); } + @Override public void notifyDeleteGraph( Graph g, Graph removed ) { record( "deleteGraph", g, removed ); } + @Override public void notifyEvent( Graph source, Object event ) { record( "someEvent", source, event ); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestCapabilities.java Wed Oct 19 11:47:05 2011 @@ -17,30 +17,39 @@ public class TestCapabilities extends Gr { protected final class AllFalse implements Capabilities { + @Override public boolean sizeAccurate() { return false; } + @Override public boolean addAllowed() { return false; } + @Override public boolean addAllowed( boolean everyTriple ) { return false; } + @Override public boolean deleteAllowed() { return false; } + @Override public boolean deleteAllowed( boolean everyTriple ) { return false; } + @Override public boolean iteratorRemoveAllowed() { return false; } + @Override public boolean canBeEmpty() { return false; } + @Override public boolean findContractSafe() { return false; } + @Override public boolean handlesLiteralTyping() { return false; } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFileGraph.java Wed Oct 19 11:47:05 2011 @@ -128,6 +128,7 @@ public class TestFileGraph extends Graph final List history = new ArrayList(); FileGraph.NotifyOnClose n = new FileGraph.NotifyOnClose() { + @Override public void notifyClosed( File f ) { history.add( f ); } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java Wed Oct 19 11:47:05 2011 @@ -27,6 +27,7 @@ public class TestFindLiterals extends Gr static final Map1 getObject = new Map1() { + @Override public Node map1( Triple o ) { return o.getObject(); } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestGraphListener.java Wed Oct 19 11:47:05 2011 @@ -64,28 +64,33 @@ public class TestGraphListener extends M ); } - public void notifyAddIterator(Graph g, Iterator it) { + @Override + public void notifyAddIterator(Graph g, Iterator it) { while (it.hasNext()) copy.add(it.next()); verify(); } - public void notifyAddTriple(Graph g, Triple t) { + @Override + public void notifyAddTriple(Graph g, Triple t) { copy.add(t); verify(); } - public void notifyDeleteIterator(Graph g, Iterator it) { + @Override + public void notifyDeleteIterator(Graph g, Iterator it) { while (it.hasNext()) copy.delete(it.next()); verify(); } - public void notifyDeleteTriple(Graph g, Triple t) { + @Override + public void notifyDeleteTriple(Graph g, Triple t) { copy.delete(t); verify(); } - public void notifyEvent(Graph source, Object value) { + @Override + public void notifyEvent(Graph source, Object value) { if (value instanceof GraphEvents) { if (GraphEvents.removeAll.equals(value)) { notifyRemoveAll(source,Triple.ANY); @@ -107,31 +112,37 @@ public class TestGraphListener extends M } - public void notifyAddList(Graph g, List triples) { + @Override + public void notifyAddList(Graph g, List triples) { notifyAddIterator(g, triples.iterator()); } - public void notifyDeleteArray(Graph g, Triple[] triples) { + @Override + public void notifyDeleteArray(Graph g, Triple[] triples) { notifyDeleteIterator(g,Arrays.asList(triples).iterator()); } - public void notifyAddArray(Graph g, Triple[] triples) { + @Override + public void notifyAddArray(Graph g, Triple[] triples) { notifyAddIterator(g,Arrays.asList(triples).iterator()); } - public void notifyAddGraph(Graph g, Graph added) { + @Override + public void notifyAddGraph(Graph g, Graph added) { notifyAddIterator(g,added.find(Triple.ANY)); } - public void notifyDeleteGraph(Graph g, Graph removed) { + @Override + public void notifyDeleteGraph(Graph g, Graph removed) { notifyDeleteIterator(g,removed.find(Triple.ANY)); } - public void notifyDeleteList(Graph g, List list) { + @Override + public void notifyDeleteList(Graph g, List list) { notifyDeleteIterator(g, list.iterator()); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java Wed Oct 19 11:47:05 2011 @@ -478,10 +478,15 @@ public class TestNode extends GraphTestB { NodeVisitor returnNode = new NodeVisitor() { + @Override public Object visitAny( Node_ANY it ) { return it; } + @Override public Object visitBlank( Node_Blank it, AnonId id ) { return it; } + @Override public Object visitLiteral( Node_Literal it, LiteralLabel lit ) { return it; } + @Override public Object visitURI( Node_URI it, String uri ) { return it; } + @Override public Object visitVariable( Node_Variable it, String name ) { return it; } }; testVisitorPatternNode( "sortOfURI", returnNode ); @@ -510,14 +515,19 @@ public class TestNode extends GraphTestB { NodeVisitor checkValue = new NodeVisitor() { + @Override public Object visitAny( Node_ANY it ) { return null; } + @Override public Object visitBlank( Node_Blank it, AnonId id ) { assertTrue( it.getBlankNodeId() == id ); return null; } + @Override public Object visitLiteral( Node_Literal it, LiteralLabel lit ) { assertTrue( it.getLiteral() == lit ); return null; } + @Override public Object visitURI( Node_URI it, String uri ) { assertTrue( it.getURI() == uri ); return null; } + @Override public Object visitVariable( Node_Variable it, String name ) { assertEquals( it.getName(), name ); return null; } }; @@ -533,14 +543,19 @@ public class TestNode extends GraphTestB final String [] strings = new String [] { "" }; NodeVisitor checkCalled = new NodeVisitor() { + @Override public Object visitAny( Node_ANY it ) { strings[0] += " any"; return null; } + @Override public Object visitBlank( Node_Blank it, AnonId id ) { strings[0] += " blank"; return null; } + @Override public Object visitLiteral( Node_Literal it, LiteralLabel lit ) { strings[0] += " literal"; return null; } + @Override public Object visitURI( Node_URI it, String uri ) { strings[0] += " uri"; return null; } + @Override public Object visitVariable( Node_Variable it, String name ) { strings[0] += " variable"; return null; } }; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/graph/test/TestRegisterGraphListener.java Wed Oct 19 11:47:05 2011 @@ -53,22 +53,33 @@ public class TestRegisterGraphListener e if (inPlay && !notified) fail("listener that was in-play was not notified of adding triple."); } + @Override final public void notifyAddTriple(Graph g, Triple t) { notified = true; doSomeDamage(); } abstract void doSomeDamage(); - public void notifyAddArray(Graph g, Triple[] triples) {} - public void notifyAddGraph(Graph g, Graph added) {} - public void notifyAddIterator(Graph g, Iterator it) {} - public void notifyAddList(Graph g, List triples) {} - public void notifyDeleteArray(Graph g, Triple[] triples) {} - public void notifyDeleteGraph(Graph g, Graph removed) {} - public void notifyDeleteIterator(Graph g, Iterator it) {} - public void notifyDeleteList(Graph g, List L) {} - public void notifyDeleteTriple(Graph g, Triple t) {} - public void notifyEvent(Graph source, Object value) {} + @Override + public void notifyAddArray(Graph g, Triple[] triples) {} + @Override + public void notifyAddGraph(Graph g, Graph added) {} + @Override + public void notifyAddIterator(Graph g, Iterator it) {} + @Override + public void notifyAddList(Graph g, List triples) {} + @Override + public void notifyDeleteArray(Graph g, Triple[] triples) {} + @Override + public void notifyDeleteGraph(Graph g, Graph removed) {} + @Override + public void notifyDeleteIterator(Graph g, Iterator it) {} + @Override + public void notifyDeleteList(Graph g, List L) {} + @Override + public void notifyDeleteTriple(Graph g, Triple t) {} + @Override + public void notifyEvent(Graph source, Object value) {} } public TestRegisterGraphListener(String name) { Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntDocumentManager.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntDocumentManager.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntDocumentManager.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/ontology/impl/TestOntDocumentManager.java Wed Oct 19 11:47:05 2011 @@ -525,6 +525,7 @@ public class TestOntDocumentManager assertNull( o1.getReadFailureHandler() ); OntDocumentManager.ReadFailureHandler rfh = new OntDocumentManager.ReadFailureHandler() { + @Override public void handleFailedRead( String url, Model model, Exception e ) {/**/}}; o1.setReadFailureHandler( rfh ); @@ -664,6 +665,7 @@ public class TestOntDocumentManager implements ReadFailureHandler { public boolean m_seen = false; + @Override public void handleFailedRead( String url, Model model, Exception e ) { m_seen = true; log.debug( "Seeing failed read of " + url, e ); @@ -682,10 +684,12 @@ public class TestOntDocumentManager m_renaming = renaming; } + @Override public void afterRead( Model model, String source, OntDocumentManager odm ) { m_after++; } + @Override public String beforeRead( Model model, String source, OntDocumentManager odm ) { if (m_renaming) { // local rewrite of the source file, which could be used e.g. to Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/ExceptionTests.java Wed Oct 19 11:47:05 2011 @@ -192,15 +192,18 @@ public class ExceptionTests - public void warning(Exception e) { + @Override + public void warning(Exception e) { throw new JenaException(e); } - public void error(Exception e) { + @Override + public void error(Exception e) { throw new JenaException(e); } - public void fatalError(Exception e) { + @Override + public void fatalError(Exception e) { } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreDOM2RDFTest.java Wed Oct 19 11:47:05 2011 @@ -71,12 +71,14 @@ public class MoreDOM2RDFTest extends Tes } + @Override public void statement(AResource subj, AResource pred, AResource obj) { count++; } + @Override public void statement(AResource subj, AResource pred, ALiteral lit) { count++; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java Wed Oct 19 11:47:05 2011 @@ -204,12 +204,14 @@ public class MoreTests extends TestCase String subj; - public void statement(AResource sub, AResource pred, ALiteral lit) { + @Override + public void statement(AResource sub, AResource pred, ALiteral lit) { // System.out.println("(" + sub + ", " + pred + ", " + lit + ")"); subj = sub.toString(); } - public void statement(AResource sub, AResource pred, AResource ob) { + @Override + public void statement(AResource sub, AResource pred, AResource ob) { // System.out.println("(" + sub + ", " + pred + ", " + ob + ")"); obj = ob.toString(); } @@ -463,23 +465,28 @@ public class MoreTests extends TestCase a.getHandlers().setStatementHandler(new StatementHandler() { int countDown = 10; - public void statement(AResource subj, AResource pred, AResource obj) { + @Override + public void statement(AResource subj, AResource pred, AResource obj) { if (countDown-- == 0) Thread.currentThread().interrupt(); } - public void statement(AResource subj, AResource pred, ALiteral lit) { + @Override + public void statement(AResource subj, AResource pred, ALiteral lit) { } }); a.getHandlers().setErrorHandler(new ErrorHandler(){ + @Override public void error(SAXParseException exception) throws SAXException { throw new RuntimeException("Unexpected error", exception); } + @Override public void fatalError(SAXParseException exception) throws SAXException { throw exception; } + @Override public void warning(SAXParseException exception) throws SAXException { throw new RuntimeException("Unexpected warning", exception); }}); @@ -580,15 +587,18 @@ public class MoreTests extends TestCase } } - public void warning(Exception e) { + @Override + public void warning(Exception e) { error(0, e); } - public void error(Exception e) { + @Override + public void error(Exception e) { error(1, e); } - public void fatalError(Exception e) { + @Override + public void fatalError(Exception e) { error(2, e); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java Wed Oct 19 11:47:05 2011 @@ -82,7 +82,8 @@ class NTripleTestSuite extends WGTestSui Set oldAnon = new HashSet(); int state = 1; // 1 begin, 2 in RDF, 3 after RDF, 4 at end-of-file. int countDown; - public void statement(AResource subj, AResource pred, AResource obj) { + @Override + public void statement(AResource subj, AResource pred, AResource obj) { Assert.assertEquals(state, 2); seeing(subj); seeing(obj); @@ -119,14 +120,16 @@ class NTripleTestSuite extends WGTestSui oldAnon.add(subj); } - public void statement(AResource subj, AResource pred, ALiteral lit) { + @Override + public void statement(AResource subj, AResource pred, ALiteral lit) { Assert.assertEquals("no start RDF seen", state, 2); seeing(subj); if (--countDown == 0) throw new SimulatedException(); } - public void endBNodeScope(AResource bnode) { + @Override + public void endBNodeScope(AResource bnode) { Assert.assertTrue(bnode.isAnonymous()); switch (state) { case 1 : @@ -147,7 +150,8 @@ class NTripleTestSuite extends WGTestSui } - public void startRDF() { + @Override + public void startRDF() { switch (state) { case 2 : case 4 : @@ -156,16 +160,19 @@ class NTripleTestSuite extends WGTestSui state = 2; } - public void endRDF() { + @Override + public void endRDF() { Assert.assertEquals(state, 2); state = 3; } - public void startPrefixMapping(String prefix, String uri) { + @Override + public void startPrefixMapping(String prefix, String uri) { } - public void endPrefixMapping(String prefix) { + @Override + public void endPrefixMapping(String prefix) { } @@ -231,7 +238,8 @@ class NTripleTestSuite extends WGTestSui /* (non-Javadoc) * @see com.hp.hpl.jena.rdf.arp.ExtendedHandler#discardNodesWithNodeID() */ - public boolean discardNodesWithNodeID() { + @Override + public boolean discardNodesWithNodeID() { return false; } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java Wed Oct 19 11:47:05 2011 @@ -627,11 +627,14 @@ class Performance { } static void parseRDF(InputStream in, String base) throws IOException { ErrorHandler eh = new ErrorHandler() { - public void warning(SAXParseException e) { + @Override + public void warning(SAXParseException e) { } - public void error(SAXParseException e) { + @Override + public void error(SAXParseException e) { } - public void fatalError(SAXParseException e) { + @Override + public void fatalError(SAXParseException e) { } }; InputStream oldIn = System.in; Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java Wed Oct 19 11:47:05 2011 @@ -1126,7 +1126,8 @@ public class SAX2RDFTest extends TestCas * * @see com.hp.hpl.jena.rdf.model.RDFErrorHandler#warning(java.lang.Exception) */ - public void warning(Exception e) { + @Override + public void warning(Exception e) { s("W", e); } @@ -1135,7 +1136,8 @@ public class SAX2RDFTest extends TestCas * * @see com.hp.hpl.jena.rdf.model.RDFErrorHandler#error(java.lang.Exception) */ - public void error(Exception e) { + @Override + public void error(Exception e) { s("E", e); } @@ -1144,7 +1146,8 @@ public class SAX2RDFTest extends TestCas * * @see com.hp.hpl.jena.rdf.model.RDFErrorHandler.errorError(java.lang.Exception) */ - public void fatalError(Exception e) { + @Override + public void fatalError(Exception e) { s("F", e); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java Wed Oct 19 11:47:05 2011 @@ -226,7 +226,8 @@ public class TaintingTests extends TestC static public boolean seen[] = new boolean[400]; - public void warning(SAXParseException e) { + @Override + public void warning(SAXParseException e) { int eNo =((ParseException)e).getErrorNumber(); if (!seen[eNo]) { seen[((ParseException)e).getErrorNumber()] = true; @@ -235,10 +236,12 @@ public class TaintingTests extends TestC } } - public void error(SAXParseException e) { + @Override + public void error(SAXParseException e) { } - public void fatalError(SAXParseException e) { + @Override + public void fatalError(SAXParseException e) { } } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java Wed Oct 19 11:47:05 2011 @@ -57,16 +57,19 @@ public class TestErrorMsg extends TestCa ARP arp = new ARP(); arp.getHandlers().setErrorHandler(new ErrorHandler() { - public void warning(SAXParseException exception) { + @Override + public void warning(SAXParseException exception) { buf.append(exception.getMessage()); buf.append("\n"); } - public void error(SAXParseException e) { + @Override + public void error(SAXParseException e) { warning(e); } - public void fatalError(SAXParseException e) { + @Override + public void fatalError(SAXParseException e) { warning(e); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestPropEltErrorMsg.java Wed Oct 19 11:47:05 2011 @@ -309,48 +309,60 @@ public class TestPropEltErrorMsg extends static private class Atts implements Attributes { ArrayList atts = new ArrayList(); + @Override public int getLength() { return atts.size(); } + @Override public String getURI(int index) { return atts.get(index).getURI(); } + @Override public String getLocalName(int index) { return atts.get(index).getLocalName(); } + @Override public String getQName(int index) { return atts.get(index).getQName(); } + @Override public String getType(int index) { return null; } + @Override public String getValue(int index) { return atts.get(index).getValue(); } + @Override public int getIndex(String uri, String localName) { return -1; } + @Override public int getIndex(String qName) { return -1; } + @Override public String getType(String uri, String localName) { return null; } + @Override public String getType(String qName) { return null; } + @Override public String getValue(String uri, String localName) { return null; } + @Override public String getValue(String qName) { return null; } @@ -427,16 +439,19 @@ public class TestPropEltErrorMsg extends XMLHandler arp = new XMLHandler(); arp.getHandlers().setErrorHandler(new ErrorHandler() { - public void warning(SAXParseException exception) { + @Override + public void warning(SAXParseException exception) { buf.append(exception.getMessage()); buf.append("\n"); } - public void error(SAXParseException e) { + @Override + public void error(SAXParseException e) { warning(e); } - public void fatalError(SAXParseException e) { + @Override + public void fatalError(SAXParseException e) { warning(e); } Modified: incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java?rev=1186119&r1=1186118&r2=1186119&view=diff ============================================================================== --- incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java (original) +++ incubator/jena/Jena2/jena/trunk/src/test/java/com/hp/hpl/jena/rdf/arp/TestScope.java Wed Oct 19 11:47:05 2011 @@ -54,13 +54,16 @@ public class TestScope extends TestCase } static RDFErrorHandler suppress = new RDFErrorHandler(){ - public void warning(Exception e) { + @Override + public void warning(Exception e) { } - public void error(Exception e) { + @Override + public void error(Exception e) { } - public void fatalError(Exception e) { + @Override + public void fatalError(Exception e) { } }; @@ -68,7 +71,8 @@ public class TestScope extends TestCase NTripleTestSuite.loadRDFx(new InFactoryX(){ - public InputStream open() throws IOException { + @Override + public InputStream open() throws IOException { return new FileInputStream(fn); } },suppress,"http://example.org/a",false,0);