You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/10/19 14:15:16 UTC
svn commit: r1186146 [5/9] - in /incubator/jena/Jena2/ARQ/trunk: ./
.settings/ src-examples/arq/examples/bgpmatching/
src-examples/arq/examples/engine/ src-examples/arq/examples/filter/
src-examples/arq/examples/propertyfunction/ src/main/java/arq/ src...
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java Wed Oct 19 12:15:05 2011
@@ -135,12 +135,15 @@ public class UpdateWriter
}
}
+ @Override
public void visit(UpdateDrop update)
{ visitDropClear("DROP", update) ; }
+ @Override
public void visit(UpdateClear update)
{ visitDropClear("CLEAR", update) ; }
+ @Override
public void visit(UpdateCreate update)
{
out.ensureStartOfLine() ;
@@ -153,6 +156,7 @@ public class UpdateWriter
out.print(s) ;
}
+ @Override
public void visit(UpdateLoad update)
{
out.ensureStartOfLine() ;
@@ -204,15 +208,19 @@ public class UpdateWriter
}
+ @Override
public void visit(UpdateAdd update)
{ printUpdate2(update, "ADD") ; }
+ @Override
public void visit(UpdateCopy update)
{ printUpdate2(update, "COPY") ; }
+ @Override
public void visit(UpdateMove update)
{ printUpdate2(update, "MOVE") ; }
+ @Override
public void visit(UpdateDataInsert update)
{
out.ensureStartOfLine() ;
@@ -220,6 +228,7 @@ public class UpdateWriter
outputQuadsBraced(update.getQuads()) ;
}
+ @Override
public void visit(UpdateDataDelete update)
{
out.ensureStartOfLine() ;
@@ -322,6 +331,7 @@ public class UpdateWriter
+ @Override
public void visit(UpdateDeleteWhere update)
{
out.ensureStartOfLine() ;
@@ -329,6 +339,7 @@ public class UpdateWriter
outputQuadsBraced(update.getQuads()) ;
}
+ @Override
public void visit(UpdateModify update)
{
out.ensureStartOfLine() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Alt.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Alt.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Alt.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Alt.java Wed Oct 19 12:15:05 2011
@@ -27,7 +27,7 @@ public class P_Alt extends P_Path2
super(p1, p2) ;
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_FixedLength.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_FixedLength.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_FixedLength.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_FixedLength.java Wed Oct 19 12:15:05 2011
@@ -45,6 +45,7 @@ public class P_FixedLength extends P_Pat
return hashFixedLength ^ (int)count ^ getSubPath().hashCode() ;
}
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Inverse.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Inverse.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Inverse.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Inverse.java Wed Oct 19 12:15:05 2011
@@ -27,7 +27,7 @@ public class P_Inverse extends P_Path1
super(p) ;
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Link.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Link.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Link.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Link.java Wed Oct 19 12:15:05 2011
@@ -32,7 +32,7 @@ public class P_Link extends P_Path0
@Override
public boolean isForward() { return true ; }
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Mod.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Mod.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Mod.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Mod.java Wed Oct 19 12:15:05 2011
@@ -36,7 +36,7 @@ public class P_Mod extends P_Path1
this.max = max ;
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_NegPropSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_NegPropSet.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_NegPropSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_NegPropSet.java Wed Oct 19 12:15:05 2011
@@ -53,7 +53,7 @@ public class P_NegPropSet extends PathBa
public List<Node> getFwdNodes() { return forwardNodes ; }
public List<Node> getBwdNodes() { return backwardNodes ; }
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_OneOrMore.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_OneOrMore.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_OneOrMore.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_OneOrMore.java Wed Oct 19 12:15:05 2011
@@ -44,7 +44,7 @@ public class P_OneOrMore extends P_Path1
return hashOneOrMore ^ getSubPath().hashCode() ;
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ReverseLink.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ReverseLink.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ReverseLink.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ReverseLink.java Wed Oct 19 12:15:05 2011
@@ -33,7 +33,7 @@ public class P_ReverseLink extends P_Pat
@Override
public boolean isForward() { return false ; }
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Seq.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Seq.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Seq.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_Seq.java Wed Oct 19 12:15:05 2011
@@ -29,7 +29,7 @@ public class P_Seq extends P_Path2
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrMore.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrMore.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrMore.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrMore.java Wed Oct 19 12:15:05 2011
@@ -44,7 +44,7 @@ public class P_ZeroOrMore extends P_Path
return hashZeroOrMore ^ getSubPath().hashCode() ;
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrOne.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrOne.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrOne.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/P_ZeroOrOne.java Wed Oct 19 12:15:05 2011
@@ -44,7 +44,7 @@ public class P_ZeroOrOne extends P_Path1
return hashZeroOrOne ^ getSubPath().hashCode() ;
}
- //@Override
+ @Override
public void visit(PathVisitor visitor)
{ visitor.visit(this) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathBase.java Wed Oct 19 12:15:05 2011
@@ -40,6 +40,7 @@ public abstract class PathBase implement
// If the labeMap is null, do .equals() on nodes, else map from
// bNode varables in one to bNodes variables in the other
+ @Override
public abstract boolean equalTo(Path path2, NodeIsomorphismMap isoMap) ;
@Override
@@ -58,6 +59,7 @@ public abstract class PathBase implement
return PathWriter.asString(this) ;
}
+ @Override
public String toString(Prologue prologue)
{
return PathWriter.asString(this, prologue) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java Wed Oct 19 12:15:05 2011
@@ -50,6 +50,7 @@ public class PathEval
static NodeIterator convertGraphNodeToRDFNode(final Model model, Iterator<Node> iter)
{
Transform<Node, RDFNode> conv = new Transform<Node, RDFNode>(){
+ @Override
public RDFNode convert(Node obj)
{
return ModelUtils.convertGraphNodeToRDFNode(obj, model) ;
@@ -137,14 +138,14 @@ public class PathEval
this.forwardMode = forward ;
}
- //@Override
+ @Override
public void visit(P_Link pathNode)
{
Iterator<Node> nodes = doOne(pathNode.getNode()) ;
fill(nodes) ;
}
- //@Override
+ @Override
public void visit(P_ReverseLink pathNode)
{
forwardMode = ! forwardMode ;
@@ -153,7 +154,7 @@ public class PathEval
fill(nodes) ;
}
- //@Override
+ @Override
public void visit(P_NegPropSet pathNotOneOf)
{
// X !(:a|:b|^:c|^:d) Y = { X !(:a|:b) Y } UNION { Y !(:c|:d) X }
@@ -169,7 +170,7 @@ public class PathEval
}
}
- //@Override
+ @Override
public void visit(P_Inverse inversePath)
{
//boolean b = forwardMode ;
@@ -179,7 +180,7 @@ public class PathEval
forwardMode = ! forwardMode ;
}
- //@Override
+ @Override
public void visit(P_Alt pathAlt)
{
// Try both sizes, accumulate into output.
@@ -189,7 +190,7 @@ public class PathEval
fill(iter) ;
}
- //@Override
+ @Override
public void visit(P_Seq pathSeq)
{
Path part1 = forwardMode ? pathSeq.getLeft() : pathSeq.getRight() ;
@@ -203,7 +204,7 @@ public class PathEval
static boolean DEBUG = false ;
- //@Override
+ @Override
public void visit(P_Mod pathMod)
{
if ( DEBUG ) IndentedWriter.stdout.println("Eval: "+pathMod+" "+node+"("+(forwardMode?"fwd":"bkd")+")") ;
@@ -297,7 +298,7 @@ public class PathEval
// If no matches, will not call eval and we drop out.
}
- //@Override
+ @Override
public void visit(P_FixedLength pFixedLength)
{
if ( pFixedLength.getCount() == 0 )
@@ -318,20 +319,20 @@ public class PathEval
}
}
- //@Override
+ @Override
public void visit(P_ZeroOrOne path)
{
doZero(path.getSubPath()) ;
doOne(path.getSubPath()) ;
}
- //@Override
+ @Override
public void visit(P_ZeroOrMore path)
{
doZeroOrMore(path.getSubPath()) ;
}
- //@Override
+ @Override
public void visit(P_OneOrMore path)
{
doOneOrMore(path.getSubPath()) ;
@@ -371,18 +372,21 @@ public class PathEval
private static Transform<Triple, Node> selectSubject = new Transform<Triple, Node>()
{
+ @Override
public Node convert(Triple triple)
{ return triple.getSubject() ; }
} ;
private static Transform<Triple, Node> selectPredicate = new Transform<Triple, Node>()
{
+ @Override
public Node convert(Triple triple)
{ return triple.getPredicate() ; }
} ;
private static Transform<Triple, Node> selectObject = new Transform<Triple, Node>()
{
+ @Override
public Node convert(Triple triple)
{ return triple.getObject() ; }
} ;
@@ -409,6 +413,7 @@ public class PathEval
{
private Collection<Node> excludes ;
public FilterExclude(Collection <Node> excludes) { this.excludes = excludes ; }
+ @Override
public boolean accept(Triple triple)
{
return ! excludes.contains(triple.getPredicate()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval_ARQ.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval_ARQ.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval_ARQ.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval_ARQ.java Wed Oct 19 12:15:05 2011
@@ -57,6 +57,7 @@ public class PathEval_ARQ
NodeIterator convertGraphNodeToRDFNode(final Model model, Iterator<Node> iter)
{
Transform<Node, RDFNode> conv = new Transform<Node, RDFNode>(){
+ @Override
public RDFNode convert(Node obj)
{
return ModelUtils.convertGraphNodeToRDFNode(obj, model) ;
@@ -142,14 +143,14 @@ public class PathEval_ARQ
this.forwardMode = forward ;
}
- //@Override
+ @Override
public void visit(P_Link pathNode)
{
Iterator<Node> nodes = doOne(pathNode.getNode()) ;
fill(nodes) ;
}
- //@Override
+ @Override
public void visit(P_ReverseLink pathNode)
{
forwardMode = ! forwardMode ;
@@ -158,7 +159,7 @@ public class PathEval_ARQ
fill(nodes) ;
}
- //@Override
+ @Override
public void visit(P_NegPropSet pathNotOneOf)
{
if ( pathNotOneOf.getBwdNodes().size() > 0 )
@@ -174,7 +175,7 @@ public class PathEval_ARQ
fill(nodes) ;
}
- //@Override
+ @Override
public void visit(P_Inverse inversePath)
{
//boolean b = forwardMode ;
@@ -184,7 +185,7 @@ public class PathEval_ARQ
forwardMode = ! forwardMode ;
}
- //@Override
+ @Override
public void visit(P_Alt pathAlt)
{
// Try both sizes, accumulate into output.
@@ -194,7 +195,7 @@ public class PathEval_ARQ
fill(iter) ;
}
- //@Override
+ @Override
public void visit(P_Seq pathSeq)
{
Path part1 = forwardMode ? pathSeq.getLeft() : pathSeq.getRight() ;
@@ -206,7 +207,7 @@ public class PathEval_ARQ
fill(iter) ;
}
- //@Override
+ @Override
public void visit(P_Mod pathMod)
{
if ( pathMod.isZeroOrMore() )
@@ -252,7 +253,7 @@ public class PathEval_ARQ
// If no matches, will not call eval and we drop out.
}
- //@Override
+ @Override
public void visit(P_FixedLength pFixedLength)
{
// P_Mod(path, count, count)
@@ -268,18 +269,18 @@ public class PathEval_ARQ
}
}
- //@Override
+ @Override
public void visit(P_ZeroOrOne path)
{
doZero(path.getSubPath()) ;
doOne(path.getSubPath()) ;
}
- //@Override
+ @Override
public void visit(P_ZeroOrMore path)
{ doZeroOrMore(path.getSubPath()) ; }
- //@Override
+ @Override
public void visit(P_OneOrMore path)
{
doOneOrMore(path.getSubPath()) ;
@@ -305,18 +306,21 @@ public class PathEval_ARQ
private static Transform<Triple, Node> selectSubject = new Transform<Triple, Node>()
{
+ @Override
public Node convert(Triple triple)
{ return triple.getSubject() ; }
} ;
private static Transform<Triple, Node> selectPredicate = new Transform<Triple, Node>()
{
+ @Override
public Node convert(Triple triple)
{ return triple.getPredicate() ; }
} ;
private static Transform<Triple, Node> selectObject = new Transform<Triple, Node>()
{
+ @Override
public Node convert(Triple triple)
{ return triple.getObject() ; }
} ;
@@ -343,6 +347,7 @@ public class PathEval_ARQ
{
private Collection<Node> excludes ;
public FilterExclude(Collection <Node> excludes) { this.excludes = excludes ; }
+ @Override
public boolean accept(Triple triple)
{
return ! excludes.contains(triple.getPredicate()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathLib.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathLib.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathLib.java Wed Oct 19 12:15:05 2011
@@ -96,7 +96,7 @@ public class PathLib
{
PropertyFunctionFactory pathPropFuncFactory = new PropertyFunctionFactory()
{
- //@Override
+ @Override
public PropertyFunction create(String uri)
{
return new PathPropertyFunction(path) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathWriter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathWriter.java Wed Oct 19 12:15:05 2011
@@ -82,13 +82,11 @@ public class PathWriter
needParens = b ;
}
- //@Override
private void output(Node node)
{
out.print(FmtUtils.stringForNode(node, prologue)) ;
}
- //@Override
private void output(P_Path0 path0)
{
if ( ! path0.isForward() )
@@ -96,19 +94,20 @@ public class PathWriter
out.print(FmtUtils.stringForNode(path0.getNode(), prologue)) ;
}
- //@Override
+ @Override
public void visit(P_Link pathNode)
{
output(pathNode.getNode()) ;
}
+ @Override
public void visit(P_ReverseLink pathNode)
{
out.println("^") ;
output(pathNode.getNode()) ;
}
- //@Override
+ @Override
public void visit(P_NegPropSet pathNotOneOf)
{
List<P_Path0> props = pathNotOneOf.getNodes() ;
@@ -152,13 +151,13 @@ public class PathWriter
- //@Override
+ @Override
public void visit(P_Alt pathAlt)
{
visit2(pathAlt, "|", true) ;
}
- //@Override
+ @Override
public void visit(P_Seq pathSeq)
{
visit2(pathSeq, "/", false) ;
@@ -185,7 +184,7 @@ public class PathWriter
if ( needParens ) out.print(")") ;
}
- //@Override
+ @Override
public void visit(P_Mod pathMod)
{
if ( needParens )
@@ -224,6 +223,7 @@ public class PathWriter
out.print(")") ;
}
+ @Override
public void visit(P_FixedLength pFixedLength)
{
if ( needParens )
@@ -241,12 +241,15 @@ public class PathWriter
out.print(")") ;
}
+ @Override
public void visit(P_ZeroOrOne path)
{ printPathMod("?", path.getSubPath()) ; }
+ @Override
public void visit(P_ZeroOrMore path)
{ printPathMod("*", path.getSubPath()) ; }
+ @Override
public void visit(P_OneOrMore path)
{ printPathMod("+", path.getSubPath()) ; }
@@ -262,6 +265,7 @@ public class PathWriter
}
// Need to consider binary ^
+ @Override
public void visit(P_Inverse inversePath)
{
out.print("^") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/ProcedurePF.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/ProcedurePF.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/ProcedurePF.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/ProcedurePF.java Wed Oct 19 12:15:05 2011
@@ -48,14 +48,17 @@ public class ProcedurePF extends PrintSe
// Procedure interface
+ @Override
public QueryIterator proc(QueryIterator input, ExecutionContext execCxt)
{
return propFunc.exec(input, subjArg, pfNode, objArg, execCxt) ;
}
+ @Override
public void build(Node procId, ExprList args, ExecutionContext execCxt)
{}
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
out.print("ProcedurePF ["+FmtUtils.stringForNode(pfNode, sCxt)+"]") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropFuncArg.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropFuncArg.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropFuncArg.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropFuncArg.java Wed Oct 19 12:15:05 2011
@@ -115,6 +115,7 @@ public class PropFuncArg extends PrintSe
}
+ @Override
public void output(final IndentedWriter out, final SerializationContext sCxt)
{
if ( argList == null && arg == null )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionBase.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public abstract class PropertyFunctionBa
this.objFuncArgType = objFuncArgType ;
}
+ @Override
public void build(PropFuncArg argSubject, Node predicate, PropFuncArg argObject, ExecutionContext execCxt)
{
if ( subjArgType.equals(PropFuncArgType.PF_ARG_SINGLE) )
@@ -72,6 +73,7 @@ public abstract class PropertyFunctionBa
+ @Override
public QueryIterator exec(QueryIterator input, PropFuncArg argSubject, Node predicate, PropFuncArg argObject, ExecutionContext execCxt)
{
// This is the property function equivalent of Substitute.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java Wed Oct 19 12:15:05 2011
@@ -36,6 +36,7 @@ class PropertyFunctionFactoryAuto implem
throw new ARQInternalErrorException("No PropertyFunction interface for "+Utils.classShortName(xClass)) ;
}
+ @Override
public PropertyFunction create(String uri)
{
try
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureBase.java Wed Oct 19 12:15:05 2011
@@ -36,12 +36,14 @@ public abstract class ProcedureBase exte
private Node procId ;
private ExprList args ;
+ @Override
public void build(Node procId, ExprList args, ExecutionContext execCxt)
{
this.procId = procId ;
this.args = args ;
}
+ @Override
public final QueryIterator proc(QueryIterator input, ExecutionContext execCxt)
{
return new RepeatApplyIteratorProc(input, execCxt) ;
@@ -50,6 +52,7 @@ public abstract class ProcedureBase exte
public abstract QueryIterator exec(Binding binding, Node name, ExprList args, ExecutionContext execCxt) ;
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
out.print("Procedure ["+FmtUtils.stringForNode(procId, sCxt)+"]") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureFactoryAuto.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureFactoryAuto.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureFactoryAuto.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/procedure/ProcedureFactoryAuto.java Wed Oct 19 12:15:05 2011
@@ -31,6 +31,7 @@ class ProcedureFactoryAuto implements Pr
extClass = xClass ;
}
+ @Override
public Procedure create(String uri)
{
try
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVOutput.java Wed Oct 19 12:15:05 2011
@@ -54,6 +54,7 @@ public class CSVOutput extends OutputBas
static String NL = "\r\n" ;
+ @Override
public void format(OutputStream out, ResultSet resultSet)
{
try {
@@ -130,6 +131,7 @@ public class CSVOutput extends OutputBas
static final byte[] noBytes = StrUtils.asUTF8bytes("no") ;
static final byte[] NLBytes = StrUtils.asUTF8bytes(NL) ;
+ @Override
public void format(OutputStream out, boolean booleanResult)
{
try
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutput.java Wed Oct 19 12:15:05 2011
@@ -26,6 +26,7 @@ public class JSONOutput extends OutputBa
{
public JSONOutput() {}
+ @Override
public void format(OutputStream out, ResultSet resultSet)
{
// Use direct string output - more control
@@ -35,6 +36,7 @@ public class JSONOutput extends OutputBa
a.apply() ;
}
+ @Override
public void format(OutputStream out, boolean booleanResult)
{
JSONOutputASK jsonOut = new JSONOutputASK(out) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java Wed Oct 19 12:15:05 2011
@@ -60,6 +60,7 @@ public class JSONOutputResultSet impleme
outputGraphBNodeLabels = ARQ.isTrue(ARQ.outputGraphBNodeLabels) ;
}
+ @Override
public void start(ResultSet rs)
{
out.println("{") ;
@@ -72,6 +73,7 @@ public class JSONOutputResultSet impleme
firstSolution = true ;
}
+ @Override
public void finish(ResultSet rs)
{
// Close last binding.
@@ -124,6 +126,7 @@ public class JSONOutputResultSet impleme
boolean firstBindingInSolution = true ;
// NB assumes are on end of previous line.
+ @Override
public void start(QuerySolution qs)
{
if ( ! firstSolution )
@@ -134,6 +137,7 @@ public class JSONOutputResultSet impleme
firstBindingInSolution = true ;
}
+ @Override
public void finish(QuerySolution qs)
{
out.println() ; // Finish last binding
@@ -141,6 +145,7 @@ public class JSONOutputResultSet impleme
out.print("}") ; // NB No newline
}
+ @Override
public void binding(String varName, RDFNode value)
{
if ( value == null )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/OutputBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/OutputBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/OutputBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/OutputBase.java Wed Oct 19 12:15:05 2011
@@ -27,6 +27,7 @@ import org.openjena.atlas.logging.Log ;
public abstract class OutputBase implements OutputFormatter
{
+ @Override
public String asString(ResultSet resultSet)
{
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/PlainFormat.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/PlainFormat.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/PlainFormat.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/PlainFormat.java Wed Oct 19 12:15:05 2011
@@ -48,8 +48,11 @@ public class PlainFormat implements Resu
this(outStream, new SerializationContext(prologue)) ;
}
+ @Override
public void start(ResultSet rs) {}
+ @Override
public void finish(ResultSet rs) { out.flush() ; }
+ @Override
public void start(QuerySolution qs)
{
count++ ;
@@ -57,7 +60,9 @@ public class PlainFormat implements Resu
first = true ;
}
+ @Override
public void finish(QuerySolution qs) { out.println() ; }
+ @Override
public void binding(String varName, RDFNode value)
{
if ( value == null )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java Wed Oct 19 12:15:05 2011
@@ -289,6 +289,7 @@ public class ResultSetCompare
private static Transform<QuerySolution, Binding> qs2b = new Transform<QuerySolution, Binding> () {
+ @Override
public Binding convert(QuerySolution item)
{
return BindingUtils.asBinding(item) ;
@@ -306,6 +307,7 @@ public class ResultSetCompare
this.literalTest = literalTest ;
}
+ @Override
public boolean equal(Node n1, Node n2)
{
if ( n1 == null && n2 == null ) return true ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java Wed Oct 19 12:15:05 2011
@@ -135,6 +135,7 @@ public class ResultSetMem implements com
* @throws UnsupportedOperationException always thrown.
*/
+ @Override
public void remove() throws java.lang.UnsupportedOperationException
{
throw new java.lang.UnsupportedOperationException(
@@ -144,30 +145,37 @@ public class ResultSetMem implements com
/**
* Is there another possibility?
*/
+ @Override
public boolean hasNext() { return iterator.hasNext() ; }
/** Moves onto the next result possibility.
*/
+ @Override
public QuerySolution nextSolution() { return new ResultBinding(model, nextBinding()) ; }
+ @Override
public Binding nextBinding() { rowNumber++ ; return iterator.next() ; }
/** Moves onto the next result possibility.
* The returned object should be of class QuerySolution
*/
+ @Override
public QuerySolution next() { return nextSolution() ; }
/** Reset this result set back to the beginning */
public void rewind( ) { reset() ; }
+ @Override
public void reset() { iterator = rows.iterator() ; rowNumber = 0 ; }
/** Return the "row" number for the current iterator item
*/
+ @Override
public int getRowNumber() { return rowNumber ; }
+ @Override
public Model getResourceModel()
{
return model ;
@@ -175,10 +183,12 @@ public class ResultSetMem implements com
/** Return the number of rows
*/
+ @Override
public int size() { return rows.size() ; }
/** Get the variable names for the projection
*/
+ @Override
public List<String> getResultVars() { return varNames ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/SortedResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/SortedResultSet.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/SortedResultSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/SortedResultSet.java Wed Oct 19 12:15:05 2011
@@ -78,32 +78,38 @@ public class SortedResultSet implements
//resultSet = new ResultSetStream(rs.getResultVars(), null, qIter) ;
}
+ @Override
public boolean hasNext()
{
return qIter.hasNext() ;
}
+ @Override
public QuerySolution next()
{
return new ResultBinding(model, nextBinding()) ;
}
+ @Override
public Binding nextBinding()
{
rowNumber++ ;
return qIter.nextBinding() ;
}
+ @Override
public QuerySolution nextSolution()
{
return new ResultBinding(null, nextBinding()) ;
}
+ @Override
public int getRowNumber()
{
return rowNumber ;
}
+ @Override
public List<String> getResultVars()
{
return resultVars ;
@@ -111,11 +117,13 @@ public class SortedResultSet implements
public boolean isOrdered() { return true ; }
+ @Override
public Model getResourceModel()
{
return model ;
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException(SortedResultSet.class.getName()+".remove") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVOutput.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class TSVOutput extends OutputBas
static String NL = "\n" ;
static String SEP = "\t" ;
+ @Override
public void format(OutputStream out, ResultSet resultSet)
{
try {
@@ -106,6 +107,7 @@ public class TSVOutput extends OutputBas
static final byte[] noBytes = StrUtils.asUTF8bytes("no") ;
static final byte[] NLBytes = StrUtils.asUTF8bytes(NL) ;
+ @Override
public void format(OutputStream out, boolean booleanResult)
{
try
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java Wed Oct 19 12:15:05 2011
@@ -60,6 +60,7 @@ public class TextOutput extends OutputBa
public TextOutput(SerializationContext cxt )
{ context = cxt ; }
+ @Override
public void format(OutputStream outs, ResultSet resultSet)
{ write(outs, resultSet) ; }
@@ -222,6 +223,7 @@ public class TextOutput extends OutputBa
return FmtUtils.stringForRDFNode(obj, context) ;
}
+ @Override
public void format(OutputStream out, boolean answer)
{
PrintWriter pw = FileUtils.asPrintWriterUTF8(out) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java Wed Oct 19 12:15:05 2011
@@ -133,20 +133,26 @@ class XMLInputSAX extends SPARQLResult
ResultSetXMLHandler2() {}
+ @Override
public void setDocumentLocator(Locator locator) {}
+ @Override
public void startDocument() throws SAXException {}
+ @Override
public void endDocument() throws SAXException {}
+ @Override
public void startPrefixMapping(String prefix, String uri) throws SAXException
{
if ( uri.equals(RDF.getURI()) )
rdfPrefix = prefix ;
}
+ @Override
public void endPrefixMapping(String prefix) throws SAXException {}
+ @Override
public void startElement(String ns, String localName, String qName, Attributes attrs) throws SAXException
{
if ( ! ns.equals(namespace) )
@@ -222,6 +228,7 @@ class XMLInputSAX extends SPARQLResult
}
+ @Override
public void endElement(String ns, String localName, String qName) throws SAXException
{
if ( ! ns.equals(namespace) )
@@ -394,6 +401,7 @@ class XMLInputSAX extends SPARQLResult
}
+ @Override
public void characters(char[] chars, int start, int finish) throws SAXException
{
if ( accumulate )
@@ -404,10 +412,13 @@ class XMLInputSAX extends SPARQLResult
}
}
+ @Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
+ @Override
public void processingInstruction(String target, String data) throws SAXException {}
+ @Override
public void skippedEntity(String name) throws SAXException {}
}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java Wed Oct 19 12:15:05 2011
@@ -218,6 +218,7 @@ class XMLInputStAX extends SPARQLResult
}
}
+ @Override
public boolean hasNext()
{
if ( ! isResultSet )
@@ -239,11 +240,13 @@ class XMLInputStAX extends SPARQLResult
return b ;
}
+ @Override
public QuerySolution next()
{
return nextSolution() ;
}
+ @Override
public Binding nextBinding()
{
if ( finished )
@@ -255,6 +258,7 @@ class XMLInputStAX extends SPARQLResult
return r ;
}
+ @Override
public QuerySolution nextSolution()
{
Binding r = nextBinding() ;
@@ -262,11 +266,13 @@ class XMLInputStAX extends SPARQLResult
return currentEnv ;
}
+ @Override
public int getRowNumber()
{
return row ;
}
+ @Override
public List<String> getResultVars()
{
return variables ;
@@ -277,13 +283,16 @@ class XMLInputStAX extends SPARQLResult
public boolean isDistinct() { return distinct ; }
// No model - it was from a stream
+ @Override
public Model getResourceModel() { return null ; }
+ @Override
public void remove()
{
throw new UnsupportedOperationException(XMLInputStAX.class.getName()) ;
}
+ @Override
public void close()
{ finished = true ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutput.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutput.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutput.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutput.java Wed Oct 19 12:15:05 2011
@@ -42,6 +42,7 @@ public class XMLOutput extends OutputBas
}
+ @Override
public void format(OutputStream out, ResultSet resultSet)
{
XMLOutputResultSet xOut = new XMLOutputResultSet(out) ;
@@ -67,6 +68,7 @@ public class XMLOutput extends OutputBas
public void setStylesheetURL(String stylesheetURL)
{ this.stylesheetURL = stylesheetURL ; }
+ @Override
public void format(OutputStream out, boolean booleanResult)
{
XMLOutputASK xOut = new XMLOutputASK(out) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutputResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutputResultSet.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutputResultSet.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLOutputResultSet.java Wed Oct 19 12:15:05 2011
@@ -60,6 +60,7 @@ public class XMLOutputResultSet
out = indentedOut ;
}
+ @Override
public void start(ResultSet rs)
{
if ( xmlInst )
@@ -110,6 +111,7 @@ public class XMLOutputResultSet
out.incIndent(INDENT) ;
}
+ @Override
public void finish(ResultSet rs)
{
out.decIndent(INDENT) ;
@@ -119,6 +121,7 @@ public class XMLOutputResultSet
out.flush() ;
}
+ @Override
public void start(QuerySolution qs)
{
out.println("<"+dfSolution+">") ;
@@ -126,12 +129,14 @@ public class XMLOutputResultSet
out.incIndent(INDENT) ;
}
+ @Override
public void finish(QuerySolution qs)
{
out.decIndent(INDENT) ;
out.println("</"+dfSolution+">") ;
}
+ @Override
public void binding(String varName, RDFNode node)
{
if ( node == null && ! outputExplicitUnbound )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtExpr.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtExpr.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtExpr.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtExpr.java Wed Oct 19 12:15:05 2011
@@ -80,8 +80,10 @@ public class FmtExpr
}
+ @Override
public void startVisit() { }
+ @Override
public void visit(ExprFunction0 expr)
{
if ( expr.getOpName() == null )
@@ -93,6 +95,7 @@ public class FmtExpr
}
+ @Override
public void visit(ExprFunction1 expr)
{
if ( expr.getOpName() == null )
@@ -107,6 +110,7 @@ public class FmtExpr
out.print(" )");
}
+ @Override
public void visit(ExprFunction2 expr)
{
if ( expr.getOpName() == null )
@@ -123,12 +127,14 @@ public class FmtExpr
out.print(" )");
}
+ @Override
public void visit(ExprFunction3 expr)
{
printInFunctionForm(expr) ;
}
+ @Override
public void visit(ExprFunctionN func)
{
if ( func instanceof E_OneOf )
@@ -177,6 +183,7 @@ public class FmtExpr
out.print(")");
}
+ @Override
public void visit(ExprFunctionOp funcOp)
{
FormatterElement fmtElt = new FormatterElement(out, context) ;
@@ -188,11 +195,13 @@ public class FmtExpr
el.visit(fmtElt) ;
}
+ @Override
public void visit(NodeValue nv)
{
out.print(nv.asQuotedString(context)) ;
}
+ @Override
public void visit(ExprVar nv)
{
String s = nv.getVarName() ;
@@ -209,12 +218,14 @@ public class FmtExpr
}
}
+ @Override
public void visit(ExprAggregator eAgg)
{
out.print(eAgg.asSparqlExpr()) ;
}
+ @Override
public void finishVisit() { out.flush() ; }
}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtTemplate.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtTemplate.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtTemplate.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FmtTemplate.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class FmtTemplate extends Formatt
return b.toString() ;
}
+ @Override
public void format(Template template)
{
out.print("{") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java Wed Oct 19 12:15:05 2011
@@ -102,6 +102,7 @@ public class FormatterElement extends Fo
public boolean topMustBeGroup() { return false ; }
+ @Override
public void visit(ElementTriplesBlock el)
{
if ( el.isEmpty() )
@@ -112,6 +113,7 @@ public class FormatterElement extends Fo
formatTriples(el.getPattern()) ;
}
+ @Override
public void visit(ElementPathBlock el)
{
if ( el.isEmpty() )
@@ -148,6 +150,7 @@ public class FormatterElement extends Fo
}
}
+ @Override
public void visit(ElementDataset el)
{
// if ( el.getDataset() != null)
@@ -176,6 +179,7 @@ public class FormatterElement extends Fo
visitAsGroup(el.getPatternElement()) ;
}
+ @Override
public void visit(ElementFilter el)
{
out.print("FILTER ") ;
@@ -199,6 +203,7 @@ public class FormatterElement extends Fo
out.print(" )") ;
}
+ @Override
public void visit(ElementAssign el)
{
out.print("LET (") ;
@@ -209,6 +214,7 @@ public class FormatterElement extends Fo
out.print(")") ;
}
+ @Override
public void visit(ElementBind el)
{
out.print("BIND(") ;
@@ -219,6 +225,7 @@ public class FormatterElement extends Fo
out.print(")") ;
}
+ @Override
public void visit(ElementUnion el)
{
if ( el.getElements().size() == 1 )
@@ -273,6 +280,7 @@ public class FormatterElement extends Fo
}
+ @Override
public void visit(ElementGroup el)
{
if ( GROUP_UNNEST_ONE && el.getElements().size() == 1 )
@@ -328,6 +336,7 @@ public class FormatterElement extends Fo
out.print("}") ;
}
+ @Override
public void visit(ElementOptional el)
{
out.print("OPTIONAL") ;
@@ -338,11 +347,13 @@ public class FormatterElement extends Fo
}
+ @Override
public void visit(ElementNamedGraph el)
{
visitNodePattern("GRAPH", el.getGraphNameNode(), el.getElement()) ;
}
+ @Override
public void visit(ElementService el)
{
String x = "SERVICE" ;
@@ -351,6 +362,7 @@ public class FormatterElement extends Fo
visitNodePattern(x, el.getServiceNode(), el.getElement()) ;
}
+ @Override
public void visit(ElementFetch el)
{
out.print("FETCH") ;
@@ -412,16 +424,19 @@ public class FormatterElement extends Fo
out.decIndent(len) ;
}
+ @Override
public void visit(ElementExists el)
{
visitElement1("EXISTS", el) ;
}
+ @Override
public void visit(ElementNotExists el)
{
visitElement1("NOT EXISTS", el) ;
}
+ @Override
public void visit(ElementMinus el)
{
out.print("MINUS") ;
@@ -431,6 +446,7 @@ public class FormatterElement extends Fo
out.decIndent(INDENT) ;
}
+ @Override
public void visit(ElementSubQuery el)
{
out.print("{ ") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/serializer/QuerySerializer.java Wed Oct 19 12:15:05 2011
@@ -68,10 +68,13 @@ public class QuerySerializer implements
+ @Override
public void startVisit(Query query) {}
+ @Override
public void visitResultForm(Query query) {}
+ @Override
public void visitPrologue(Prologue prologue)
{
int row1 = out.getRow() ;
@@ -81,6 +84,7 @@ public class QuerySerializer implements
out.newline() ;
}
+ @Override
public void visitSelectResultForm(Query query)
{
out.print("SELECT ") ;
@@ -97,6 +101,7 @@ public class QuerySerializer implements
out.newline() ;
}
+ @Override
public void visitConstructResultForm(Query query)
{
out.print("CONSTRUCT ") ;
@@ -115,6 +120,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitDescribeResultForm(Query query)
{
out.print("DESCRIBE ") ;
@@ -132,12 +138,14 @@ public class QuerySerializer implements
out.newline() ;
}
+ @Override
public void visitAskResultForm(Query query)
{
out.print("ASK") ;
out.newline() ;
}
+ @Override
public void visitDatasetDecl(Query query)
{
if ( query.getGraphURIs() != null && query.getGraphURIs().size() != 0 )
@@ -161,6 +169,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitQueryPattern(Query query)
{
if ( query.getQueryPattern() != null )
@@ -178,6 +187,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitGroupBy(Query query)
{
if ( query.hasGroupBy() )
@@ -193,6 +203,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitHaving(Query query)
{
if ( query.hasHaving() )
@@ -207,6 +218,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitOrderBy(Query query)
{
if ( query.hasOrderBy() )
@@ -224,6 +236,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitLimit(Query query)
{
if ( query.hasLimit() )
@@ -233,6 +246,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitOffset(Query query)
{
if ( query.hasOffset() )
@@ -242,6 +256,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void visitBindings(Query query)
{
if ( query.hasBindings() )
@@ -278,6 +293,7 @@ public class QuerySerializer implements
}
}
+ @Override
public void finishVisit(Query query)
{
out.flush() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java Wed Oct 19 12:15:05 2011
@@ -153,15 +153,19 @@ public class Item extends ItemLocation
static class ItemHashCode implements ItemVisitor
{
int hashCode = 0 ;
+ @Override
public void visit(Item item, ItemList list)
{ hashCode = list.hashCode() ; }
+ @Override
public void visit(Item item, Node node)
{ hashCode = node.hashCode() ; }
+ @Override
public void visit(Item item, String symbol)
{ hashCode = symbol.hashCode() ; }
+ @Override
public void visitNil()
{ hashCode = -99 ; }
}
@@ -180,15 +184,19 @@ public class Item extends ItemLocation
ItemEquals(Item other) { this.other = other ; }
boolean result = false ;
+ @Override
public void visit(Item item, ItemList list)
{ result = ( other.isList() && other.getList().equals(list) ) ; }
+ @Override
public void visit(Item item, Node node)
{ result = ( other.isNode() && other.getNode().equals(node) ) ; }
+ @Override
public void visit(Item item, String symbol)
{ result = ( other.isSymbol() && other.getSymbol().equals(symbol) ) ; }
+ @Override
public void visitNil()
{ result = other.isNil() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemList.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemList.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemList.java Wed Oct 19 12:15:05 2011
@@ -75,6 +75,7 @@ public class ItemList extends ItemLocati
public Item getLast() { return get(_size()-1) ; }
+ @Override
public Iterator<Item> iterator() { return elements.listIterator(offset) ; }
public Item car()
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformBase.java Wed Oct 19 12:15:05 2011
@@ -22,16 +22,19 @@ import com.hp.hpl.jena.graph.Node ;
public class ItemTransformBase implements ItemTransform
{
+ @Override
public Item transform(Item item, ItemList list)
{
return Item.createList(list, item.getLine(), item.getColumn()) ;
}
+ @Override
public Item transform(Item item, Node node)
{
return Item.createNode(node, item.getLine(), item.getColumn()) ;
}
+ @Override
public Item transform(Item item, String symbol)
{
return Item.createSymbol(symbol, item.getLine(), item.getColumn()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java Wed Oct 19 12:15:05 2011
@@ -48,6 +48,7 @@ public class ItemTransformer
public Item result()
{ return stack.peek() ; }
+ @Override
public void visit(Item item, ItemList list)
{
ItemList newList = new ItemList(item.getLine(), item.getColumn()) ;
@@ -62,17 +63,20 @@ public class ItemTransformer
push(newItemList) ;
}
+ @Override
public void visit(Item item, Node node)
{
Item newItem = transform.transform(item, node) ;
push(newItem) ;
}
+ @Override
public void visit(Item item, String symbol)
{
Item newItem = transform.transform(item, symbol) ;
push(newItem) ;
}
+ @Override
public void visitNil()
{ push(Item.nil) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWalker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWalker.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWalker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWalker.java Wed Oct 19 12:15:05 2011
@@ -35,6 +35,7 @@ public class ItemWalker
private ItemVisitor visitor ;
Worker(ItemVisitor visitor) { this.visitor = visitor ; }
+ @Override
public void visit(Item item, ItemList list)
{
for ( Iterator<Item> iter = list.iterator() ; iter.hasNext() ; )
@@ -45,16 +46,19 @@ public class ItemWalker
visitor.visit(item, list) ;
}
+ @Override
public void visit(Item item, Node node)
{
visitor.visit(item, node) ;
}
+ @Override
public void visit(Item item, String symbol)
{
visitor.visit(item, symbol) ;
}
+ @Override
public void visitNil()
{ visitor.visitNil() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWriter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemWriter.java Wed Oct 19 12:15:05 2011
@@ -106,12 +106,15 @@ public class ItemWriter
}
}
+ @Override
public void visit(Item item, Node node)
{ out.print(FmtUtils.stringForNode(node, sCxt)) ; }
+ @Override
public void visit(Item item, String symbol)
{ out.print(symbol) ; }
+ @Override
public void visit(Item item, ItemList list)
{
out.print("(") ;
@@ -134,6 +137,7 @@ public class ItemWriter
printOneLine(list) ;
}
+ @Override
public void visitNil()
{ out.print("nil") ; }