jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1186119 [10/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 GMT
Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java Wed Oct 19 11:47:05 2011
@@ -29,6 +29,7 @@ public class StrConcat extends BaseBuilt
      * 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 "strConcat";
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Sum.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Sum.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Sum.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Sum.java Wed Oct 19 11:47:05 2011
@@ -24,6 +24,7 @@ public class Sum extends BaseBuiltin {
      * 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 "sum";
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Table.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Table.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Table.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Table.java Wed Oct 19 11:47:05 2011
@@ -25,6 +25,7 @@ public class Table extends BaseBuiltin {
      * 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 "table";
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/TableAll.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/TableAll.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/TableAll.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/TableAll.java Wed Oct 19 11:47:05 2011
@@ -26,6 +26,7 @@ public class TableAll extends BaseBuilti
      * 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 "tableAll";
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Unbound.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Unbound.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Unbound.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Unbound.java Wed Oct 19 11:47:05 2011
@@ -25,6 +25,7 @@ public class Unbound extends BaseBuiltin
      * 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 "unbound";
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BBRuleContext.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BBRuleContext.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BBRuleContext.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BBRuleContext.java Wed Oct 19 11:47:05 2011
@@ -45,6 +45,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#contains(com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Node)
      */
+    @Override
     public boolean contains(Node s, Node p, Node o) {
         ClosableIterator<Triple> i = find(s, p, o);
         boolean result = i.hasNext();
@@ -55,6 +56,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#contains(com.hp.hpl.jena.graph.Triple)
      */
+    @Override
     public boolean contains(Triple t) {
         return contains(t.getSubject(), t.getPredicate(), t.getObject());
     }
@@ -62,6 +64,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#find(com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Node, com.hp.hpl.jena.graph.Node)
      */
+    @Override
     public ClosableIterator<Triple> find(Node s, Node p, Node o) {
         return graph.findDataMatches(new TriplePattern(s, p, o));
 //        return searchpath.find(new TriplePattern(s, p, o));
@@ -70,6 +73,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#getEnv()
      */
+    @Override
     public BindingEnvironment getEnv() {
         return env;
     }
@@ -84,6 +88,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#getGraph()
      */
+    @Override
     public InfGraph getGraph() {
         return graph;
     }
@@ -91,6 +96,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#getRule()
      */
+    @Override
     public Rule getRule() {
         return rule;
     }
@@ -98,6 +104,7 @@ public class BBRuleContext implements Ru
     /**
      * @see com.hp.hpl.jena.reasoner.rulesys.RuleContext#setRule(com.hp.hpl.jena.reasoner.rulesys.Rule)
      */
+    @Override
     public void setRule(Rule rule) {
         this.rule = rule;
     }
@@ -105,6 +112,7 @@ public class BBRuleContext implements Ru
     /**
      * Assert a new triple in the deduction graph, bypassing any processing machinery.
      */
+    @Override
     public void silentAdd(Triple t) {
         ((SilentAddI)graph).silentAdd(t);
     }
@@ -113,6 +121,7 @@ public class BBRuleContext implements Ru
      * Assert a new triple in the deduction graph, triggering any consequent processing as appropriate.
      * In the backward case there no immediate consequences so this is equivalent to a silentAdd.
      */
+    @Override
     public void add(Triple t) {
         ((SilentAddI)graph).silentAdd(t);
     }
@@ -120,6 +129,7 @@ public class BBRuleContext implements Ru
     /**
      * Remove a triple from the deduction graph (and the original graph if relevant).
      */
+    @Override
     public void remove(Triple t) {
         graph.delete(t);
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BFRuleContext.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BFRuleContext.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BFRuleContext.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BFRuleContext.java Wed Oct 19 11:47:05 2011
@@ -67,6 +67,7 @@ public class BFRuleContext implements Ru
      * Returns the current variable binding environment for the current rule.
      * @return BindingEnvironment
      */
+    @Override
     public BindingEnvironment getEnv() {
         return env;
     }
@@ -85,6 +86,7 @@ public class BFRuleContext implements Ru
      * Returns the graph.
      * @return InfGraph
      */
+    @Override
     public InfGraph getGraph() {
         return graph;
     }
@@ -93,6 +95,7 @@ public class BFRuleContext implements Ru
      * Returns the rule.
      * @return Rule
      */
+    @Override
     public Rule getRule() {
         return rule;
     }
@@ -101,6 +104,7 @@ public class BFRuleContext implements Ru
      * Sets the rule.
      * @param rule The rule to set
      */
+    @Override
     public void setRule(Rule rule) {
         this.rule = rule;
     }
@@ -125,6 +129,7 @@ public class BFRuleContext implements Ru
      * <p>This is needed to prevent concurrrent modification exceptions which searching
      * the deductions for matches to a given rule.
      */
+    @Override
     public void add(Triple t) {
         if (graph.shouldTrace()) {
             if (rule != null) {
@@ -162,6 +167,7 @@ public class BFRuleContext implements Ru
      * Return true if the triple is already in either the graph or the stack.
      * I.e. it has already been deduced.
      */
+    @Override
     public boolean contains(Triple t) {
         // Can't use stackCache.contains because that does not do semantic equality
         return contains(t.getSubject(), t.getPredicate(), t.getObject());
@@ -171,6 +177,7 @@ public class BFRuleContext implements Ru
      * Return true if the triple pattern is already in either the graph or the stack.
      * I.e. it has already been deduced.
      */
+    @Override
     public boolean contains(Node s, Node p, Node o) {
         // Can't use stackCache.contains because that does not do semantic equality
         ClosableIterator<Triple> it = find(s, p, o);
@@ -184,6 +191,7 @@ public class BFRuleContext implements Ru
      * visible to the underlying graph but need to be checked for.
      * However, currently this calls the graph find directly.
      */
+    @Override
     public ClosableIterator<Triple> find(Node s, Node p, Node o) {
         //return graph.find(s, p, o).andThen(pendingCache.find(s, p, o));
         return graph.findDataMatches(s, p, o);
@@ -214,6 +222,7 @@ public class BFRuleContext implements Ru
     /**
      * Assert a new triple in the deduction graph, bypassing any processing machinery.
      */
+    @Override
     public void silentAdd(Triple t) {
         ((SilentAddI)graph).silentAdd(t);
     }
@@ -221,6 +230,7 @@ public class BFRuleContext implements Ru
     /**
      * Remove a triple from the deduction graph (and the original graph if relevant).
      */
+    @Override
     public void remove(Triple t) {
         deletesPending.add(t);
 //        graph.delete(t);

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java Wed Oct 19 11:47:05 2011
@@ -141,6 +141,7 @@ public class BindingStack implements Bin
      * just return it, if it is a varible bound in this enviroment return the binding,
      * if it is an unbound variable return the variable.
      */
+    @Override
     public Node getGroundVersion(Node node) {
         Node bind = getBinding(node);
         if (bind == null) {
@@ -172,6 +173,7 @@ public class BindingStack implements Bin
      * @param value the value to bind
      * @return false if the binding fails
      */
+    @Override
     public boolean bind(Node var, Node value) {
         if (var instanceof Node_RuleVariable) {
             return bind(((Node_RuleVariable)var).getIndex(), value);
@@ -197,6 +199,7 @@ public class BindingStack implements Bin
      * @param env the current binding environment
      * @return a new, instantiated triple
      */
+    @Override
     public Triple instantiate(TriplePattern pattern) {
         Node s = getGroundVersion(pattern.getSubject());
         if (s.isVariable()) s = Node.createAnon();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java Wed Oct 19 11:47:05 2011
@@ -102,6 +102,7 @@ public class BindingVector implements Bi
      * just return it, if it is a varible bound in this enviroment return the binding,
      * if it is an unbound variable return the variable.
      */
+    @Override
     public Node getGroundVersion(Node node) {
         Node bind = getBinding(node);
         if (bind == null) {
@@ -137,6 +138,7 @@ public class BindingVector implements Bi
      * @param value the value to bind
      * @return false if the binding fails
      */
+    @Override
     public boolean bind(Node var, Node value) {
         if (var instanceof Node_RuleVariable) {
             return bind(((Node_RuleVariable)var).getIndex(), value);
@@ -180,6 +182,7 @@ public class BindingVector implements Bi
      * @param env the current binding environment
      * @return a new, instantiated triple
      */
+    @Override
     public Triple instantiate(TriplePattern pattern) {
         Node s = getGroundVersion(pattern.getSubject());
         if (s.isVariable()) s = Node.createAnon();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/ConsumerChoicePointFrame.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/ConsumerChoicePointFrame.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/ConsumerChoicePointFrame.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/ConsumerChoicePointFrame.java Wed Oct 19 11:47:05 2011
@@ -143,6 +143,7 @@ public class ConsumerChoicePointFrame ex
     /**
      * Return true if this choice point could usefully be restarted.
      */
+    @Override
     public boolean isReady() {
         return generator.numResults() > resultIndex;
     }
@@ -165,6 +166,7 @@ public class ConsumerChoicePointFrame ex
     /**
      * Reactivate this choice point to return new results.
      */
+    @Override
     public void pump() {
         if (context instanceof Generator) {
             ((Generator)context).pump(this);
@@ -176,6 +178,7 @@ public class ConsumerChoicePointFrame ex
     /**
      * Return the generator associated with this entry (might be the entry itself)
      */
+    @Override
     public Generator getGenerator() {
         return generator;
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/FRuleEngine.java Wed Oct 19 11:47:05 2011
@@ -99,6 +99,7 @@ public class FRuleEngine implements FRul
      * @param inserts the set of triples to be processed, normally this is the
      * raw data graph but may include additional deductions made by preprocessing hooks
      */
+    @Override
     public void init(boolean ignoreBrules, Finder inserts) {
         if (clauseIndex == null) compile(rules, ignoreBrules);
         findAndProcessAxioms();
@@ -113,6 +114,7 @@ public class FRuleEngine implements FRul
      * @param inserts the set of triples to be processed, normally this is the
      * raw data graph but may include additional deductions made by preprocessing hooks
      */
+    @Override
     public void fastInit(Finder inserts) {
         findAndProcessActions();
         // Create the reasoning context
@@ -138,6 +140,7 @@ public class FRuleEngine implements FRul
      * Add one triple to the data graph, run any rules triggered by
      * the new data item, recursively adding any generated triples.
      */
+    @Override
     public synchronized void add(Triple t) {
         BFRuleContext context = new BFRuleContext(infGraph);
         context.addTriple(t);
@@ -149,6 +152,7 @@ public class FRuleEngine implements FRul
      * @return true if the effects could be correctly propagated or
      * false if not (in which case the entire engine should be restarted).
      */
+    @Override
     public synchronized boolean delete(Triple t) {
         // Incremental delete not supported
         return false;
@@ -158,6 +162,7 @@ public class FRuleEngine implements FRul
      * Return the number of rules fired since this rule engine instance
      * was created and initialized
      */
+    @Override
     public long getNRulesFired() {
         return nRulesFired;
     }
@@ -166,6 +171,7 @@ public class FRuleEngine implements FRul
      * Return true if the internal engine state means that tracing is worthwhile.
      * It will return false during the axiom bootstrap phase.
      */
+    @Override
     public boolean shouldTrace() {
 //        return processedAxioms;
         return true;
@@ -174,6 +180,7 @@ public class FRuleEngine implements FRul
     /**
      * Set to true to enable derivation caching
      */
+    @Override
     public void setDerivationLogging(boolean recordDerivations) {
         this.recordDerivations = recordDerivations;
     }
@@ -182,6 +189,7 @@ public class FRuleEngine implements FRul
      * Access the precomputed internal rule form. Used when precomputing the
      * internal axiom closures.
      */
+    @Override
     public Object getRuleStore() {
         return new RuleStore(clauseIndex, predicatesUsed, wildcardRule);
     }
@@ -189,6 +197,7 @@ public class FRuleEngine implements FRul
     /**
      * Set the internal rule from from a precomputed state.
      */
+    @Override
     public void setRuleStore(Object ruleStore) {
         RuleStore rs = (RuleStore)ruleStore;
         clauseIndex = rs.clauseIndex;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/Generator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/Generator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/Generator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/Generator.java Wed Oct 19 11:47:05 2011
@@ -91,6 +91,7 @@ public class Generator implements LPAgen
      * Return true if the generator is ready to be scheduled (i.e. it is not
      * known to be complete and not known to be waiting for a dependent generator).
      */
+    @Override
     public boolean isReady() {
         if (isComplete()) return false;
         if (checkReadyNeeded) {
@@ -112,6 +113,7 @@ public class Generator implements LPAgen
      * Directly set that this generator is ready (because the generator
      * for one of its generatingCPs has produced new results).
      */
+    @Override
     public void setReady(ConsumerChoicePointFrame ccp) {
         if (!isComplete()) {
             interpreter.engine.schedule(ccp);
@@ -202,6 +204,7 @@ public class Generator implements LPAgen
     /**
      * Notify that the interpreter has now blocked on the given choice point.
      */
+    @Override
     public void notifyBlockedOn(ConsumerChoicePointFrame ccp) {
         generatingCPs.add(ccp);
         checkReadyNeeded = true; 
@@ -211,6 +214,7 @@ public class Generator implements LPAgen
      * Notify this context that the given choice point has terminated
      * and can be remove from the wait list. 
      */
+    @Override
     public void notifyFinished(ConsumerChoicePointFrame ccp) {
         if (generatingCPs != null) {
             generatingCPs.remove(ccp); 
@@ -222,6 +226,7 @@ public class Generator implements LPAgen
      * Start this generator running for the first time.
      * Should be called from within an appropriately synchronized block.
      */
+    @Override
     public void pump() {
         pump(this);
     }
@@ -266,6 +271,7 @@ public class Generator implements LPAgen
     /**
      * Return the generator associated with this entry (might be the entry itself)
      */
+    @Override
     public Generator getGenerator() {
         return this;
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBRuleEngine.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBRuleEngine.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBRuleEngine.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBRuleEngine.java Wed Oct 19 11:47:05 2011
@@ -414,6 +414,7 @@ public class LPBRuleEngine {
         }
         
         /** Ordering */
+        @Override
         public int compareTo(Count other) {
             return (count < other.count) ? -1 : ( (count == other.count) ? 0 : +1);
         }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java Wed Oct 19 11:47:05 2011
@@ -38,6 +38,7 @@ public class LPBindingEnvironment implem
      * just return it, if it is a varible bound in this environment return the binding,
      * if it is an unbound variable return the variable.
      */
+    @Override
     public Node getGroundVersion(Node node) {
         return LPInterpreter.deref(node);
     }
@@ -49,6 +50,7 @@ public class LPBindingEnvironment implem
      * @param value the value to bind
      * @return false if the binding fails
      */
+    @Override
     public boolean bind(Node var, Node value) {
         Node dvar = var;
         if (dvar instanceof Node_RuleVariable) dvar = ((Node_RuleVariable)dvar).deref();
@@ -69,6 +71,7 @@ public class LPBindingEnvironment implem
      * @param env the current binding environment
      * @return a new, instantiated triple
      */
+    @Override
     public Triple instantiate(TriplePattern pattern) {
         Node s = getGroundVersion(pattern.getSubject());
         if (s.isVariable()) s = Node.createAnon();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPTopGoalIterator.java Wed Oct 19 11:47:05 2011
@@ -100,6 +100,7 @@ public class LPTopGoalIterator implement
 
     /** Notify this context that a brach was suspended awaiting futher
      *  results from the given generator. */
+    @Override
     public void notifyBlockedOn(ConsumerChoicePointFrame ccp) {
         choicePoints.add(ccp);
         checkReadyNeeded = true;
@@ -109,6 +110,7 @@ public class LPTopGoalIterator implement
      * Notify this context that the given choice point has terminated
      * and can be remove from the wait list.
      */
+    @Override
     public void notifyFinished(ConsumerChoicePointFrame ccp) {
         choicePoints.remove(ccp);
         checkReadyNeeded = true;
@@ -118,6 +120,7 @@ public class LPTopGoalIterator implement
      * Directly set that this generator is ready (because the generating
      * for one of its generatingCPs has produced new results).
      */
+    @Override
     public void setReady(ConsumerChoicePointFrame ccp) {
         nextToRun = ccp;
         isReady = true;
@@ -128,6 +131,7 @@ public class LPTopGoalIterator implement
      * Return true if the iterator is ready to be scheduled (i.e. it is not
      * known to be complete and not known to be waiting for a dependent generator).
      */
+    @Override
     public boolean isReady() {
         if (checkReadyNeeded) {
             isReady = false;
@@ -151,6 +155,7 @@ public class LPTopGoalIterator implement
     /**
      * @see com.hp.hpl.jena.util.iterator.ClosableIterator#close()
      */
+    @Override
     public synchronized void close() {
         if (interpreter != null) {
             synchronized (interpreter.getEngine()) {
@@ -176,6 +181,7 @@ public class LPTopGoalIterator implement
     /**
      * @see java.util.Iterator#hasNext()
      */
+    @Override
     public boolean hasNext() {
         checkCME();
         if (!lookaheadValid) moveForward();
@@ -185,6 +191,7 @@ public class LPTopGoalIterator implement
     /**
      * @see java.util.Iterator#next()
      */
+    @Override
     public Triple next() {
         checkCME();
         if (!lookaheadValid) moveForward();
@@ -218,6 +225,7 @@ public class LPTopGoalIterator implement
     /**
      * @see java.util.Iterator#remove()
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLExptRuleTranslationHook.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLExptRuleTranslationHook.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLExptRuleTranslationHook.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLExptRuleTranslationHook.java Wed Oct 19 11:47:05 2011
@@ -36,6 +36,7 @@ public class OWLExptRuleTranslationHook 
      * @param inserts a temporary graph into which the hook should insert
      * all new deductions that should be seen by the rules.
      */
+    @Override
     public void run(FBRuleInfGraph infGraph, Finder dataFind, Graph inserts) {
         Iterator<Triple> it = dataFind.find(new TriplePattern(null, OWL.intersectionOf.asNode(), null));
         while (it.hasNext()) {
@@ -88,6 +89,7 @@ public class OWLExptRuleTranslationHook 
      * then the inference will be restarted at next prepare time. Incremental
      * re-processing is not yet supported.
      */
+    @Override
     public boolean needsRerun(FBRuleInfGraph infGraph, Triple t) {
         return (t.getPredicate().equals(OWL.intersectionOf.asNode()));
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLRuleTranslationHook.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLRuleTranslationHook.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLRuleTranslationHook.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/OWLRuleTranslationHook.java Wed Oct 19 11:47:05 2011
@@ -37,6 +37,7 @@ public class OWLRuleTranslationHook impl
      * @param inserts a temporary graph into which the hook should insert
      * all new deductions that should be seen by the rules.
      */
+    @Override
     public void run(FBRuleInfGraph infGraph, Finder dataFind, Graph inserts) {
         Iterator<Triple> it = dataFind.find(new TriplePattern(null, OWL.intersectionOf.asNode(), null));
         while (it.hasNext()) {
@@ -126,6 +127,7 @@ public class OWLRuleTranslationHook impl
      * then the inference will be restarted at next prepare time. Incremental
      * re-processing is not yet supported.
      */
+    @Override
     public boolean needsRerun(FBRuleInfGraph infGraph, Triple t) {
         return (t.getPredicate().equals(OWL.intersectionOf.asNode()));
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RDFSCMPPreprocessHook.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RDFSCMPPreprocessHook.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RDFSCMPPreprocessHook.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RDFSCMPPreprocessHook.java Wed Oct 19 11:47:05 2011
@@ -39,6 +39,7 @@ public class RDFSCMPPreprocessHook imple
      * @param inserts a temporary graph into which the hook should insert
      * all new deductions that should be seen by the rules.
      */
+    @Override
     public void run(FBRuleInfGraph infGraph, Finder dataFind, Graph inserts) {
         ExtendedIterator<Triple> it = dataFind.find(new TriplePattern(null, null, null));
         HashSet<Node> properties = new HashSet<Node>();
@@ -62,6 +63,7 @@ public class RDFSCMPPreprocessHook imple
      * then the inference will be restarted at next prepare time. Incremental
      * re-processing is not yet supported but in this case would be useful.
      */
+    @Override
     public boolean needsRerun(FBRuleInfGraph infGraph, Triple t) {
         return (t.getPredicate().getURI().startsWith(memberPrefix));
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEClauseFilter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEClauseFilter.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEClauseFilter.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEClauseFilter.java Wed Oct 19 11:47:05 2011
@@ -169,6 +169,7 @@ public class RETEClauseFilter implements
     /**
      * Set the continuation node for this node.
      */
+    @Override
     public void setContinuation(RETESinkNode continuation) {
         this.continuation = continuation;
     }
@@ -246,6 +247,7 @@ public class RETEClauseFilter implements
      * @param netCopy a map from RETENode to cloned instance
      * @param context the new context to which the network is being ported
      */
+    @Override
     public RETENode clone(Map<RETENode, RETENode> netCopy, RETERuleContext context) {
         RETEClauseFilter clone = (RETEClauseFilter)netCopy.get(this);
         if (clone == null) {

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEEngine.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEEngine.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEEngine.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEEngine.java Wed Oct 19 11:47:05 2011
@@ -114,6 +114,7 @@ public class RETEEngine implements FRule
      * @param inserts the set of triples to be processed, normally this is the
      * raw data graph but may include additional deductions made by preprocessing hooks
      */
+    @Override
     public void init(boolean ignoreBrules, Finder inserts) {
         compile(rules, ignoreBrules);
         findAndProcessAxioms();
@@ -126,6 +127,7 @@ public class RETEEngine implements FRule
      * @param inserts the set of triples to be processed, normally this is the
      * raw data graph but may include additional deductions made by preprocessing hooks
      */
+    @Override
     public void fastInit(Finder inserts) {
         conflictSet = new RETEConflictSet(new RETERuleContext(infGraph, this), isMonotonic);
         // Below is used during testing to ensure that all ruleset work (if less efficiently) if marked as non-monotonic
@@ -155,6 +157,7 @@ public class RETEEngine implements FRule
      * Add one triple to the data graph, run any rules triggered by
      * the new data item, recursively adding any generated triples.
      */
+    @Override
     public synchronized void add(Triple t) {
         addTriple(t, false);
         runAll();
@@ -165,6 +168,7 @@ public class RETEEngine implements FRule
      * @return true if the effects could be correctly propagated or
      * false if not (in which case the entire engine should be restarted).
      */
+    @Override
     public synchronized boolean delete(Triple t) {
         deleteTriple(t, false);
         runAll();
@@ -175,6 +179,7 @@ public class RETEEngine implements FRule
      * Return the number of rules fired since this rule engine instance
      * was created and initialized
      */
+    @Override
     public long getNRulesFired() {
         return nRulesFired;
     }
@@ -183,6 +188,7 @@ public class RETEEngine implements FRule
      * Return true if the internal engine state means that tracing is worthwhile.
      * It will return false during the axiom bootstrap phase.
      */
+    @Override
     public boolean shouldTrace() {
         return true;
 //        return processedAxioms;
@@ -191,6 +197,7 @@ public class RETEEngine implements FRule
     /**
      * Set to true to enable derivation caching
      */
+    @Override
     public void setDerivationLogging(boolean recordDerivations) {
         this.recordDerivations = recordDerivations;
     }
@@ -199,6 +206,7 @@ public class RETEEngine implements FRule
      * Access the precomputed internal rule form. Used when precomputing the
      * internal axiom closures.
      */
+    @Override
     public Object getRuleStore() {
         return new RuleStore(clauseIndex, predicatePatterns, wildcardRule, isMonotonic);
     }
@@ -206,6 +214,7 @@ public class RETEEngine implements FRule
     /**
      * Set the internal rule from from a precomputed state.
      */
+    @Override
     public void setRuleStore(Object ruleStore) {
         RuleStore rs = (RuleStore)ruleStore;
         predicatePatterns = rs.predicatePatterns;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETEQueue.java Wed Oct 19 11:47:05 2011
@@ -67,6 +67,7 @@ public class RETEQueue implements RETESi
     /**
      * Set the continuation node for this node (and any sibling)
      */
+    @Override
     public void setContinuation(RETESinkNode continuation) {
         this.continuation = continuation;
         if (sibling != null) sibling.continuation = continuation;
@@ -77,6 +78,7 @@ public class RETEQueue implements RETESi
      * @param env a set of variable bindings for the rule being processed. 
      * @param isAdd distinguishes between add and remove operations.
      */
+    @Override
     public void fire(BindingVector env, boolean isAdd) {
         // Store the new token in this store
         Count count = queue.get(env);
@@ -158,6 +160,7 @@ public class RETEQueue implements RETESi
      * Clone this node in the network.
      * @param context the new context to which the network is being ported
      */
+    @Override
     public RETENode clone(Map<RETENode, RETENode> netCopy, RETERuleContext context) {
         RETEQueue clone = (RETEQueue)netCopy.get(this);
         if (clone == null) {

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETERuleContext.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETERuleContext.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETERuleContext.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETERuleContext.java Wed Oct 19 11:47:05 2011
@@ -48,6 +48,7 @@ public class RETERuleContext implements 
      * Returns the current variable binding environment for the current rule.
      * @return BindingEnvironment
      */
+    @Override
     public BindingEnvironment getEnv() {
         return env;
     }
@@ -56,6 +57,7 @@ public class RETERuleContext implements 
      * Returns the graph.
      * @return InfGraph
      */
+    @Override
     public InfGraph getGraph() {
         return graph;
     }
@@ -71,6 +73,7 @@ public class RETERuleContext implements 
      * Returns the rule.
      * @return Rule
      */
+    @Override
     public Rule getRule() {
         return rule;
     }
@@ -79,6 +82,7 @@ public class RETERuleContext implements 
      * Sets the rule.
      * @param rule The rule to set
      */
+    @Override
     public void setRule(Rule rule) {
         this.rule = rule;
     }
@@ -95,6 +99,7 @@ public class RETERuleContext implements 
      * Return true if the triple is already in either the graph or the stack.
      * I.e. it has already been deduced.
      */
+    @Override
     public boolean contains(Triple t) {
         // Can't use stackCache.contains because that does not do semantic equality
         return contains(t.getSubject(), t.getPredicate(), t.getObject());
@@ -104,6 +109,7 @@ public class RETERuleContext implements 
      * Return true if the triple pattern is already in either the graph or the stack.
      * I.e. it has already been deduced.
      */
+    @Override
     public boolean contains(Node s, Node p, Node o) {
         ClosableIterator<Triple> it = find(s, p, o);
         boolean result = it.hasNext();
@@ -116,6 +122,7 @@ public class RETERuleContext implements 
      * visible to the underlying graph but need to be checked for.
      * However, currently this calls the graph find directly.
      */
+    @Override
     public ClosableIterator<Triple> find(Node s, Node p, Node o) {
         //return graph.find(s, p, o).andThen(pendingCache.find(s, p, o));
         return graph.findDataMatches(s, p, o);
@@ -124,6 +131,7 @@ public class RETERuleContext implements 
     /**
      * Assert a new triple in the deduction graph, bypassing any processing machinery.
      */
+    @Override
     public void silentAdd(Triple t) {
         ((SilentAddI)graph).silentAdd(t);
     }
@@ -131,6 +139,7 @@ public class RETERuleContext implements 
     /**
      * Remove a triple from the deduction graph (and the original graph if relevant).
      */
+    @Override
     public void remove(Triple t) {
         graph.getRawGraph().delete(t);
         engine.deleteTriple(t, true);
@@ -139,6 +148,7 @@ public class RETERuleContext implements 
     /**
      * Assert a new triple in the deduction graph, triggering any consequent processing as appropriate.
      */
+    @Override
     public void add(Triple t) {
         engine.addTriple(t, true);
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RETETerminal.java Wed Oct 19 11:47:05 2011
@@ -63,6 +63,7 @@ public class RETETerminal implements RET
      * @param env a set of variable bindings for the rule being processed. 
      * @param isAdd distinguishes between add and remove operations.
      */
+    @Override
     public void fire(BindingVector env, boolean isAdd) {
         Rule rule = context.getRule();
         context.setEnv(env);
@@ -79,6 +80,7 @@ public class RETETerminal implements RET
      * @param context the new context to which the network is being ported
      */
     
+    @Override
     public RETENode clone(Map<RETENode, RETENode> netCopy, RETERuleContext contextIn) {
         RETETerminal clone = (RETETerminal)netCopy.get(this);
         if (clone == null) {

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/WrappedReasonerFactory.java Wed Oct 19 11:47:05 2011
@@ -33,6 +33,7 @@ public final class WrappedReasonerFactor
          loaded with this Wrapper's rules (if the Reasoner is a RuleReasoner) and
          bound to this Wrapper's schemas (in an unspecified order).
      */
+    @Override
     public Reasoner create( Resource ignored )
         { Reasoner result = factory.create( config );
         return schemaUnion.isEmpty() ? result : result.bindSchema( schemaUnion ); }
@@ -59,12 +60,14 @@ public final class WrappedReasonerFactor
     /**
          Answer the capabilities of the underlying ReasonerFactory.
     */
+    @Override
     public Model getCapabilities()
         { return factory.getCapabilities(); }
     
     /**
          Answer the URI of the underlying ReasonerFactory. 
     */
+    @Override
     public String getURI()
         { return factory.getURI(); }
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/GraphNode.java Wed Oct 19 11:47:05 2011
@@ -251,7 +251,8 @@ class GraphNode {
         Set<GraphNode> sc = new HashSet<GraphNode>(target.succClosed);
         sc.add(target); 
 		visitPredecessors(new Visitor<Set<GraphNode>, GraphNode>() {
-			public List<GraphNode> visit(GraphNode node, GraphNode processing, Set<GraphNode> sc, GraphNode target) {
+			@Override
+            public List<GraphNode> visit(GraphNode node, GraphNode processing, Set<GraphNode> sc, GraphNode target) {
 				// Add closure
 				node.succClosed.addAll( sc );
 				// Scan for redundant links
@@ -283,7 +284,8 @@ class GraphNode {
 		visited.add(this);
 		// Scan predecessors not including ourselves
 		doVisitPredecessors(new Visitor<Set<GraphNode>, Object>() {
-			public List<GraphNode> visit(GraphNode node, GraphNode processing, Set<GraphNode> sc, Object ignored ) {
+			@Override
+            public List<GraphNode> visit(GraphNode node, GraphNode processing, Set<GraphNode> sc, Object ignored ) {
 				// Add closure
 				node.succClosed.addAll(sc);
 				// Scan for redundant links
@@ -359,6 +361,7 @@ class GraphNode {
      */
     private void relocateAllRefTo(GraphNode lead, Set<GraphNode> done) {
         visitPredecessors(new Visitor<Set<GraphNode>, GraphNode>(){
+            @Override
             public List<GraphNode> visit(GraphNode node, GraphNode processing, Set<GraphNode> done, GraphNode leadIn) {
                 if (done.add( node )) {
                     Set<GraphNode> members = leadIn.siblings();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java Wed Oct 19 11:47:05 2011
@@ -355,6 +355,7 @@ public class TransitiveGraphCache implem
             members = new HashSet<GraphNode>();
             members.add(endN);
             startN.visitPredecessors(new Visitor<Set<GraphNode>, GraphNode>() {
+                @Override
                 public List<GraphNode> visit(GraphNode node, GraphNode processing, Set<GraphNode> members, GraphNode endN) {
                     if (endN.pathTo(node)) members.add( node );
                     return null;
@@ -462,6 +463,7 @@ public class TransitiveGraphCache implem
      * will be asked for additional match results if the implementor
      * may not have completely satisfied the query.
      */
+    @Override
     public ExtendedIterator<Triple> findWithContinuation(TriplePattern pattern, Finder continuation) {
         Node p = pattern.getPredicate();
         
@@ -481,6 +483,7 @@ public class TransitiveGraphCache implem
     /**
      * Return true if the given pattern occurs somewhere in the find sequence.
      */
+    @Override
     public boolean contains(TriplePattern pattern) {
         ClosableIterator<Triple> it = find(pattern);
         boolean result = it.hasNext();
@@ -525,6 +528,7 @@ public class TransitiveGraphCache implem
      * @return a ExtendedIterator over all Triples in the data set
      *  that match the pattern
      */
+    @Override
     public ExtendedIterator<Triple> find(TriplePattern pattern) {
     	if (deletesPending != null && deletesPending.size() > 0) {
     		processDeletes();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasoner.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasoner.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasoner.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasoner.java Wed Oct 19 11:47:05 2011
@@ -82,6 +82,7 @@ public class TransitiveReasoner implemen
      * information supplied at construction time. May be null if there are
      * no useful capabilities registered.
      */
+    @Override
     public Model getReasonerCapabilities() {
         return TransitiveReasonerFactory.theInstance().getCapabilities();
     }
@@ -92,6 +93,7 @@ public class TransitiveReasoner implemen
      * @param configSpec a Model into which the configuration information should be placed
      * @param base the Resource to which the configuration parameters should be added.
      */
+    @Override
     public void addDescription(Model configSpec, Resource base) {
         // No configuration
     }
@@ -103,6 +105,7 @@ public class TransitiveReasoner implemen
      * this is part of the SPI rather than API
      * @return true if the given property is handled specially by the reasoner.
      */
+    @Override
     public boolean supportsProperty(Property property) {
         ReasonerFactory rf = TransitiveReasonerFactory.theInstance();
         Model caps = rf.getCapabilities();
@@ -119,6 +122,7 @@ public class TransitiveReasoner implemen
      * subClassOf is discovered.
      * @param tbox schema containing the property and class declarations
      */
+    @Override
     public Reasoner bindSchema(Graph tbox) throws ReasonerException {
         return bindSchema(new FGraph(tbox));
     }
@@ -132,6 +136,7 @@ public class TransitiveReasoner implemen
      * subClassOf is discovered.
      * @param tbox schema containing the property and class declarations
      */
+    @Override
     public Reasoner bindSchema(Model tbox) throws ReasonerException {
         return bindSchema(new FGraph(tbox.getGraph()));
     }
@@ -168,6 +173,7 @@ public class TransitiveReasoner implemen
      * @throws ReasonerException if the data is ill-formed according to the
      * constraints imposed by this reasoner.
      */
+    @Override
     public InfGraph bind(Graph data) throws ReasonerException {
         return new TransitiveInfGraph(data, this);
     }   
@@ -180,6 +186,7 @@ public class TransitiveReasoner implemen
      * <p>
      * Default - false.
      */
+    @Override
     public void setDerivationLogging(boolean logOn) {
         // Irrelevant to this reasoner
     }
@@ -193,7 +200,8 @@ public class TransitiveReasoner implemen
       * @param value the new value for the parameter, typically this is a wrapped
       * java object like Boolean or Integer.
       */
-     public void setParameter(Property parameter, Object value) {
+     @Override
+    public void setParameter(Property parameter, Object value) {
          throw new IllegalParameterException(parameter.toString());
      }
     
@@ -225,6 +233,7 @@ public class TransitiveReasoner implemen
      * Return the Jena Graph Capabilties that the inference graphs generated
      * by this reasoner are expected to conform to.
      */
+    @Override
     public Capabilities getGraphCapabilities() {
         if (capabilities == null) {
             capabilities = new BaseInfGraph.InfFindSafeCapabilities();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasonerFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasonerFactory.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasonerFactory.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/reasoner/transitiveReasoner/TransitiveReasonerFactory.java Wed Oct 19 11:47:05 2011
@@ -43,6 +43,7 @@ public class TransitiveReasonerFactory i
      * passed the reasoner encoded within an RDF graph. This reasoner has no
      * configuration parameters so this arg is always ignored.
      */
+    @Override
     public Reasoner create(Resource configuration) {
         return new TransitiveReasoner();
     }
@@ -52,6 +53,7 @@ public class TransitiveReasonerFactory i
      * RDF. This method is normally called by the ReasonerRegistry which caches
      * the resulting information so dynamically creating here is not really an overhead.
      */
+    @Override
     public Model getCapabilities() {
         if (capabilities == null) {
             capabilities = ModelFactory.createDefaultModel();
@@ -70,6 +72,7 @@ public class TransitiveReasonerFactory i
     /**
      * Return the URI labelling this type of reasoner
      */
+    @Override
     public String getURI() {
         return URI;
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMRSW.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMRSW.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMRSW.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMRSW.java Wed Oct 19 11:47:05 2011
@@ -59,6 +59,7 @@ public class LockMRSW implements Lock 
      * </pre>
      */
     
+    @Override
     final public void enterCriticalSection(boolean readLockRequested)
     {
         // Don't make {enter|leave}CriticalSection synchronized - deadlock will occur.
@@ -122,6 +123,7 @@ public class LockMRSW implements Lock 
      *  @see #enterCriticalSection
      */
     
+    @Override
     final public void leaveCriticalSection()
     {
         

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMutex.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMutex.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMutex.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockMutex.java Wed Oct 19 11:47:05 2011
@@ -11,11 +11,13 @@ public class LockMutex implements Lock 
 {
     java.util.concurrent.locks.Lock mutex = new java.util.concurrent.locks.ReentrantLock() ;
     
+    @Override
     public void enterCriticalSection(boolean readLockRequested)
     {
         mutex.lock();
     }
 
+    @Override
     public void leaveCriticalSection()
     {
         mutex.unlock() ;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockNone.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockNone.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockNone.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/LockNone.java Wed Oct 19 11:47:05 2011
@@ -8,10 +8,12 @@ package com.hp.hpl.jena.shared;
 
 public class LockNone implements Lock 
 {
+    @Override
     public void enterCriticalSection(boolean readLockRequested)
     {
     }
 
+    @Override
     public void leaveCriticalSection()
     {
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/impl/PrefixMappingImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/impl/PrefixMappingImpl.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/impl/PrefixMappingImpl.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/impl/PrefixMappingImpl.java Wed Oct 19 11:47:05 2011
@@ -43,12 +43,14 @@ public class PrefixMappingImpl implement
     protected String get( String prefix )
         { return prefixToURI.get( prefix ); }
            
+    @Override
     public PrefixMapping lock()
         { 
         locked = true; 
         return this;
         }
         
+    @Override
     public PrefixMapping setNsPrefix( String prefix, String uri ) 
         {
         checkUnlocked();
@@ -59,6 +61,7 @@ public class PrefixMappingImpl implement
         return this;
         }
     
+    @Override
     public PrefixMapping removeNsPrefix( String prefix )
         {
         checkUnlocked();
@@ -96,6 +99,7 @@ public class PrefixMappingImpl implement
         
         @param other the PrefixMapping whose bindings we are to add to this.
     */
+    @Override
     public PrefixMapping setNsPrefixes( PrefixMapping other )
         { return setNsPrefixes( other.getNsPrefixMap() ); }
     
@@ -104,6 +108,7 @@ public class PrefixMappingImpl implement
          mappings in <code>other</code> where neither <code>p</code> nor
          <code>u</code> appear in this mapping.
     */
+    @Override
     public PrefixMapping withDefaultMappings( PrefixMapping other )
         {
         checkUnlocked();
@@ -124,6 +129,7 @@ public class PrefixMappingImpl implement
         
          @param other the Map whose bindings we are to add to this.
     */
+    @Override
     public PrefixMapping setNsPrefixes( Map<String, String> other )
         {
         checkUnlocked();
@@ -141,12 +147,15 @@ public class PrefixMappingImpl implement
             throw new PrefixMapping.IllegalPrefixException( prefix ); 
         }
         
+    @Override
     public String getNsPrefixURI( String prefix ) 
         { return get( prefix ); }
         
+    @Override
     public Map<String, String> getNsPrefixMap()
         { return CollectionFactory.createHashedMap( prefixToURI ); }
         
+    @Override
     public String getNsURIPrefix( String uri )
         { return URItoPrefix.get( uri ); }
         
@@ -155,6 +164,7 @@ public class PrefixMappingImpl implement
         Head:Tail is subject to mapping if Head is in the prefix mapping. So, if
         someone takes it into their heads to define eg "http" or "ftp" we have problems.
     */
+    @Override
     public String expandPrefix( String prefixed )
         {
         int colon = prefixed.indexOf( ':' );
@@ -184,6 +194,7 @@ public class PrefixMappingImpl implement
         
      	@see com.hp.hpl.jena.shared.PrefixMapping#qnameFor(java.lang.String)
     */
+    @Override
     public String qnameFor( String uri )
         { 
         int split = Util.splitNamespace( uri );
@@ -200,12 +211,14 @@ public class PrefixMappingImpl implement
         efficient algorithm available, preprocessing the prefix strings into some
         kind of search table, but for the moment we don't need it.
     */
+    @Override
     public String shortForm( String uri )
         {
         Entry<String, String> e = findMapping( uri, true );
         return e == null ? uri : e.getKey() + ":" + uri.substring( (e.getValue()).length() );
         }
         
+    @Override
     public boolean samePrefixMappingAs( PrefixMapping other )
         {
         return other instanceof PrefixMappingImpl 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V1_Gen.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V1_Gen.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V1_Gen.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V1_Gen.java Wed Oct 19 11:47:05 2011
@@ -102,12 +102,14 @@ public class UUID_V1_Gen implements UUID
 
     /** (Re)set the network id (a random number) and the timstamp */
     
+    @Override
     public void reset()
     {
         setInitialState() ;
         setTime() ;
     }
 
+    @Override
     public JenaUUID generate()
     { return generateV1() ; }
         
@@ -140,6 +142,7 @@ public class UUID_V1_Gen implements UUID
      */
 
     
+    @Override
     public JenaUUID parse(String s) throws FormatException
     {
         s = s.toLowerCase() ;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/shared/uuid/UUID_V4_Gen.java Wed Oct 19 11:47:05 2011
@@ -25,7 +25,8 @@ public class UUID_V4_Gen implements UUID
     
     public UUID_V4_Gen() {}
     
-	public JenaUUID generate()
+	@Override
+    public JenaUUID generate()
     { return generateV4() ; }
     
     public UUID_V4 generateV4()
@@ -39,7 +40,8 @@ public class UUID_V4_Gen implements UUID
     }
     
     
-	public JenaUUID parse(String s)
+	@Override
+    public JenaUUID parse(String s)
     { return parseV4(s) ; }
     
     public UUID_V4 parseV4(String s)
@@ -99,6 +101,7 @@ public class UUID_V4_Gen implements UUID
             reset() ;
     }
 
+    @Override
     public void reset() 
     {
         random =  LibUUID.makeRandom() ; 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java Wed Oct 19 11:47:05 2011
@@ -34,6 +34,7 @@ public class LocatorClassLoader  impleme
     public int hashCode()
         { return classLoader.hashCode(); }
     
+    @Override
     public TypedStream open(String filenameOrURI)
     {
         if ( classLoader == null )
@@ -60,6 +61,7 @@ public class LocatorClassLoader  impleme
         // base = classLoader.getResource(fn).toExternalForm ;       
         return new TypedStream(in) ;
     }
+    @Override
     public String getName() { return "ClassLoaderLocator" ; }
 }
 /*

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorFile.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorFile.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorFile.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorFile.java Wed Oct 19 11:47:05 2011
@@ -106,6 +106,7 @@ public class LocatorFile implements Loca
         return f.exists() ;
     }
     
+    @Override
     public TypedStream open(String filenameOrURI)
     {
         // Worry about %20.
@@ -143,6 +144,7 @@ public class LocatorFile implements Loca
             return null ;
         }
     }
+    @Override
     public String getName()
     {
         String tmp = "LocatorFile" ;

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorURL.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorURL.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorURL.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorURL.java Wed Oct 19 11:47:05 2011
@@ -29,6 +29,7 @@ public class LocatorURL implements Locat
     
     static final String[] schemeNames = { "http:" , "https:" } ;    // Must be lower case and include the ":"
 
+    @Override
     public TypedStream open(String filenameOrURI)
     {
         if ( ! acceptByScheme(filenameOrURI) )
@@ -105,6 +106,7 @@ public class LocatorURL implements Locat
         return LocatorURL.class.hashCode();
     }
     
+    @Override
     public String getName() { return "LocatorURL" ; } 
     
     private boolean acceptByScheme(String filenameOrURI)

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorZip.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorZip.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorZip.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/LocatorZip.java Wed Oct 19 11:47:05 2011
@@ -40,6 +40,7 @@ class LocatorZip implements Locator
         }
     }
     
+    @Override
     public TypedStream open(String filenameOrURI)
     {
         ZipEntry entry = zipFile.getEntry(filenameOrURI) ;
@@ -71,6 +72,7 @@ class LocatorZip implements Locator
             return null;
         }
     }
+    @Override
     public String getName() { return "LocatorZip("+zipFileName+")" ; } 
 
 }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/ModelQueryUtil.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/ModelQueryUtil.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/ModelQueryUtil.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/ModelQueryUtil.java Wed Oct 19 11:47:05 2011
@@ -32,7 +32,8 @@ public class ModelQueryUtil
         ( final Model model, Model query, Resource [] variables )
         {
         Map1<Domain, List<? extends RDFNode>> mm = new Map1<Domain, List<? extends RDFNode>>()
-            { public List<? extends RDFNode> map1( Domain x ) { return mappy( model, x ); } };
+            { @Override
+            public List<? extends RDFNode> map1( Domain x ) { return mappy( model, x ); } };
         QueryMapper qm = new QueryMapper( query, variables );
         return
             qm.getQuery().executeBindings( model.getGraph(), qm.getVariables() )

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/OneToManyMap.java Wed Oct 19 11:47:05 2011
@@ -85,6 +85,7 @@ public class OneToManyMap<From, To> impl
     /**
      * Clear all entries from the map.
      */
+    @Override
     public void clear() {
         m_table.clear();
     }
@@ -96,6 +97,7 @@ public class OneToManyMap<From, To> impl
      * @param key The key object to test for
      * @return True or false
      */
+    @Override
     public boolean containsKey( Object key ) {
         return m_table.containsKey( key );
     }
@@ -109,6 +111,7 @@ public class OneToManyMap<From, To> impl
      * @param value The value to test for
      * @return True if the value is in the map
      */
+    @Override
     public boolean containsValue( Object value ) {
         for (Iterator<List<To>> values = m_table.values().iterator();  values.hasNext(); ) {
             List<To> x = values.next();
@@ -140,6 +143,7 @@ public class OneToManyMap<From, To> impl
      *
      * @return A Set of the mappings as Map.Entry values.
      */
+    @Override
     public Set<Map.Entry<From, To>> entrySet() {
         Set<Map.Entry<From, To>> s = CollectionFactory.createHashedSet();
 
@@ -184,6 +188,7 @@ public class OneToManyMap<From, To> impl
      * @return One of the values this key corresponds to, or null.
      * @see #getAll
      */
+    @Override
     public To get( Object key ) {
         List<To> entry = m_table.get( key );
 
@@ -234,6 +239,7 @@ public class OneToManyMap<From, To> impl
      *
      * @return True if there are no entries.
      */
+    @Override
     public boolean isEmpty() {
         return m_table.isEmpty();
     }
@@ -244,6 +250,7 @@ public class OneToManyMap<From, To> impl
      *
      * @return The keys of the map as a Set
      */
+    @Override
     public Set<From> keySet() {
         return m_table.keySet();
     }
@@ -259,6 +266,7 @@ public class OneToManyMap<From, To> impl
      * @param value The value object
      * @return Null.
      */
+    @Override
     public To put( From key, To value ) {
         List<To> entries = m_table.get( key );
         if (entries == null) entries = new ArrayList<To>();
@@ -274,6 +282,7 @@ public class OneToManyMap<From, To> impl
      * OneToManyMap, and, if so, copies all of the entries for each key.</p>
      * @param m The map whose contents are to be copied into this map
      */
+    @Override
     public void putAll( Map<? extends From, ? extends To> m ) {
         boolean many = (m instanceof OneToManyMap<?,?>);
         
@@ -307,6 +316,7 @@ public class OneToManyMap<From, To> impl
      * @param key All associations with this key will be removed
      * @return null
      */
+    @Override
     public To remove( Object key ) {
         m_table.remove( key );
         return null;
@@ -339,6 +349,7 @@ public class OneToManyMap<From, To> impl
      * <p>Answer the number of key-value mappings in the map</p>
      * @return The number of key-value pairs.
      */
+    @Override
     public int size() {
         int size = 0;
         for (Iterator<From> i = m_table.keySet().iterator();  i.hasNext();  ) {
@@ -354,6 +365,7 @@ public class OneToManyMap<From, To> impl
      * for multiple keys are suppressed.</p>
      * @return A set of the values contained in this map.
      */
+    @Override
     public Collection<To> values() {
         Set<To> s = CollectionFactory.createHashedSet();
         for (Iterator<From> e = m_table.keySet().iterator();  e.hasNext();  ) {
@@ -459,6 +471,7 @@ public class OneToManyMap<From, To> impl
          *
          * @return The key object
          */
+        @Override
         public From getKey() {
             return m_key;
         }
@@ -469,6 +482,7 @@ public class OneToManyMap<From, To> impl
          *
          * @return The value object
          */
+        @Override
         public To getValue() {
             return m_value;
         }
@@ -477,6 +491,7 @@ public class OneToManyMap<From, To> impl
         /**
          * Set the value, which writes through to the map. Not implemented.
          */
+        @Override
         public To setValue( To value )
             throws  UnsupportedOperationException
         {

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/EnhancedNodeCache.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/EnhancedNodeCache.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/EnhancedNodeCache.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/EnhancedNodeCache.java Wed Oct 19 11:47:05 2011
@@ -43,6 +43,7 @@ public class EnhancedNodeCache implement
         { this.name = name;
         this.elements = new EnhNode[size]; }
 
+    @Override
     public Object get( Object key )
         {
         if (enabled)
@@ -60,6 +61,7 @@ public class EnhancedNodeCache implement
         return null;
         }
 
+    @Override
     public void put( Object key, Object value )
         {
         if (enabled)
@@ -78,23 +80,29 @@ public class EnhancedNodeCache implement
     protected int hashNode( Node n )
         { return (n.hashCode() & 0x7fffffff) % elements.length; }
 
+    @Override
     public boolean getEnabled()
         { return enabled; }
 
+    @Override
     public boolean setEnabled( boolean enabled )
         { boolean result = this.enabled;
         this.enabled = enabled;
         return result; }
     
+    @Override
     public void clear()
         { for (int i = 0; i < elements.length; i += 1) elements[i] = null; }
 
+    @Override
     public long getGets()
         { return gets; }
 
+    @Override
     public long getPuts()
         { return puts; }
 
+    @Override
     public long getHits()
         { return hits; }
 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/cache/RandCache.java Wed Oct 19 11:47:05 2011
@@ -63,6 +63,7 @@ public class RandCache implements Cache,
         collection = map.values();
     }
 
+    @Override
     public synchronized Object get(Object key) {
         if (enabled) {
             if (gets == Long.MAX_VALUE) {
@@ -79,6 +80,7 @@ public class RandCache implements Cache,
         }
     }
 
+    @Override
     public synchronized void put(Object key, Object value) {
 
         // don't allow null values
@@ -113,28 +115,34 @@ public class RandCache implements Cache,
         }
     }
 
+    @Override
     public synchronized boolean getEnabled() {
         return enabled;
     }
 
+    @Override
     public synchronized boolean setEnabled(boolean enabled) {
         boolean result = enabled;
         this.enabled = enabled;
         return result;
     }
 
+    @Override
     public synchronized void clear() {
         map.clear();
     }
 
+    @Override
     public synchronized long getHits() {
         return hits;
     }
 
+    @Override
     public synchronized long getGets() {
         return gets;
     }
 
+    @Override
     public synchronized long getPuts() {
         return puts;
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ArrayIterator.java Wed Oct 19 11:47:05 2011
@@ -50,10 +50,12 @@ public class ArrayIterator<T> implements
 		if (!a.getClass().isArray())
 			throw new ArrayStoreException();
 	}
-	public boolean hasNext() {
+	@Override
+    public boolean hasNext() {
 		return i<Array.getLength(a);
 	}
-	public T next() throws NoSuchElementException {
+	@Override
+    public T next() throws NoSuchElementException {
 		try {
 			return a[i++]; // Array.get(a,i++);
 		}
@@ -65,6 +67,7 @@ public class ArrayIterator<T> implements
  * @throws java.lang.UnsupportedOperationException Always.
  *
  */        
+        @Override
         public void remove() {
 
             throw new UnsupportedOperationException();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/ConcatenatedIterator.java Wed Oct 19 11:47:05 2011
@@ -77,6 +77,7 @@ public class ConcatenatedIterator<T> imp
      *
      * @return true if the iterator has more elements.
      */
+    @Override
     public boolean hasNext() {
         return m_iter0.hasNext()  ||  m_iter1.hasNext() || (hasDefaultValue() && !m_defaultValueSeen);
     }
@@ -89,6 +90,7 @@ public class ConcatenatedIterator<T> imp
      *         underlying iteration, projected to the range of the projection function.
      * @exception NoSuchElementException - iteration has no more elements.
      */
+    @Override
     public T next() {
         boolean next0 = m_iter0.hasNext();
         boolean next1 = m_iter1.hasNext();
@@ -128,6 +130,7 @@ public class ConcatenatedIterator<T> imp
      *            called, or the remove method has already been called after the
      *            last call to the next method.
      */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException( "Cannot remove elements from concatenated iterator" );
     }

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/IteratorIterator.java Wed Oct 19 11:47:05 2011
@@ -56,7 +56,8 @@ public class IteratorIterator<T> impleme
 /** Is there another element in one of the Iterator's
  * still to consider.
  */        
-	public boolean hasNext() {
+	@Override
+    public boolean hasNext() {
 		while ( currentMember == null || !currentMember.hasNext() ) {
 			if (!top.hasNext())
 				return false;
@@ -65,7 +66,8 @@ public class IteratorIterator<T> impleme
 		return true;
 	}
 
-	public T next() {
+	@Override
+    public T next() {
 		hasNext();
 		if (currentMember == null)
 			throw new NoSuchElementException();
@@ -74,6 +76,7 @@ public class IteratorIterator<T> impleme
 /** remove's the element from the underlying Iterator
  * in which it is a member.
  */        
+        @Override
         public void remove() {
 	  if (currentMember == null)
 			throw new IllegalStateException();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LateBindingIterator.java Wed Oct 19 11:47:05 2011
@@ -58,16 +58,19 @@ abstract public class LateBindingIterato
     public LateBindingIterator() {
     }
 
+    @Override
     public boolean hasNext() {
         lazy();
         return it.hasNext();
     }
     
+    @Override
     public T next() {
         lazy();
         return it.next();
     }
     
+    @Override
     public void remove() {
         lazy();
         it.remove();

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/LazyIterator.java Wed Oct 19 11:47:05 2011
@@ -28,17 +28,20 @@ abstract public class LazyIterator<T> im
 	public LazyIterator() {
 	}
 
-	public boolean hasNext() {
+	@Override
+    public boolean hasNext() {
 		lazy();
 		return it.hasNext();
 	}
 
-	public T next() {
+	@Override
+    public T next() {
 		lazy();
 		return it.next();
 	}
 
-	public void remove() {
+	@Override
+    public void remove() {
 		lazy();
 		it.remove();
 	}
@@ -48,22 +51,26 @@ abstract public class LazyIterator<T> im
 		return it.andThen(other);
 	}
 
-	public ExtendedIterator<T> filterKeep(Filter<T> f) {
+	@Override
+    public ExtendedIterator<T> filterKeep(Filter<T> f) {
 		lazy();
 		return it.filterKeep(f);
 	}
 
-	public ExtendedIterator<T> filterDrop(Filter<T> f) {
+	@Override
+    public ExtendedIterator<T> filterDrop(Filter<T> f) {
 		lazy();
 		return it.filterDrop(f);
 	}
 
-	public <U> ExtendedIterator<U> mapWith(Map1<T,U> map1) {
+	@Override
+    public <U> ExtendedIterator<U> mapWith(Map1<T,U> map1) {
 		lazy();
 		return it.mapWith(map1);
 	}
 
-	public void close() {
+	@Override
+    public void close() {
 		lazy();
 		it.close();
 			

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/NiceIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/NiceIterator.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/NiceIterator.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/iterator/NiceIterator.java Wed Oct 19 11:47:05 2011
@@ -24,12 +24,14 @@ public class NiceIterator<T> implements 
     /**
         default close: don't need to do anything.
     */
+    @Override
     public void close()
         { }
 
     /**
         default hasNext: no elements, return false.
     */
+    @Override
     public boolean hasNext()
         {  return false; }
 
@@ -39,6 +41,7 @@ public class NiceIterator<T> implements 
     /**
         default next: throw an exception.
     */
+    @Override
     public T next()
         { throw new NoSuchElementException( "empty NiceIterator" ); }
         
@@ -56,6 +59,7 @@ public class NiceIterator<T> implements 
     /**
         default remove: we have no elements, so we can't remove any.
     */
+    @Override
     public void remove()
         { 
         throw new UnsupportedOperationException( "remove not supported for this iterator" ); 
@@ -64,6 +68,7 @@ public class NiceIterator<T> implements 
     /**
          Answer the next object, and remove it.
     */
+    @Override
     public T removeNext()
         { T result = next(); remove(); return result; }
         
@@ -117,24 +122,28 @@ public class NiceIterator<T> implements 
     /**
         make a new iterator, which is us then the other chap.
     */   
+    @Override
     public <X extends T> ExtendedIterator<T> andThen( Iterator<X> other )
         { return andThen( this, other ); }
         
     /**
         make a new iterator, which is our elements that pass the filter
     */
+    @Override
     public ExtendedIterator<T> filterKeep( Filter<T> f )
         { return new FilterKeepIterator<T>( f, this ); }
 
     /**
         make a new iterator, which is our elements that do not pass the filter
     */        
+    @Override
     public ExtendedIterator<T> filterDrop( final Filter<T> f )
         { return new FilterDropIterator<T>( f, this ); }
    
     /**
         make a new iterator which is the elementwise _map1_ of the base iterator.
     */     
+    @Override
     public <U> ExtendedIterator<U> mapWith( Map1<T, U> map1 )
         { return new Map1Iterator<T, U>( map1, this ); }
 
@@ -155,12 +164,14 @@ public class NiceIterator<T> implements 
     /**
         Answer a list of the elements in order, consuming this iterator.
     */
+    @Override
     public List<T> toList()
         { return asList( this ); }
 
     /**
         Answer a list of the elements in order, consuming this iterator.
     */
+    @Override
     public Set<T> toSet()
         { return asSet( this ); }
 

Modified: incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java?rev=1186119&r1=1186118&r2=1186119&view=diff
==============================================================================
--- incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java (original)
+++ incubator/jena/Jena2/jena/trunk/src/main/java/com/hp/hpl/jena/util/tuple/TupleSet.java Wed Oct 19 11:47:05 2011
@@ -37,6 +37,7 @@ public class TupleSet implements Iterato
             in = (BufferedReader)r;
     }
 
+    @Override
     public boolean hasNext()
     {
         if ( finished ) return false ;
@@ -46,6 +47,7 @@ public class TupleSet implements Iterato
         return current != null ;
     }
 
+    @Override
     public List<TupleItem> next()
     {
         if ( hasNext() )
@@ -59,6 +61,7 @@ public class TupleSet implements Iterato
     }
 
 
+    @Override
     public void remove()
     {
         throw new java.lang.UnsupportedOperationException("TupleSet.remove") ;



Mime
View raw message