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 [2/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/algebra/OpVisitorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorBase.java Wed Oct 19 12:15:05 2011
@@ -24,99 +24,131 @@ import com.hp.hpl.jena.sparql.algebra.op
public class OpVisitorBase implements OpVisitor
{
+ @Override
public void visit(OpBGP opBGP)
{}
+ @Override
public void visit(OpQuadPattern quadPattern)
{}
+ @Override
public void visit(OpTriple opTriple)
{}
+ @Override
public void visit(OpPath opPath)
{}
+ @Override
public void visit(OpProcedure opProc)
{}
+ @Override
public void visit(OpPropFunc opPropFunc)
{}
+ @Override
public void visit(OpJoin opJoin)
{}
+ @Override
public void visit(OpSequence opSequence)
{}
+ @Override
public void visit(OpDisjunction opDisjunction)
{}
+ @Override
public void visit(OpLeftJoin opLeftJoin)
{}
+ @Override
public void visit(OpConditional opCond)
{}
+ @Override
public void visit(OpMinus opMinus)
{}
+ @Override
public void visit(OpDiff opDiff)
{}
+ @Override
public void visit(OpUnion opUnion)
{}
+ @Override
public void visit(OpFilter opFilter)
{}
+ @Override
public void visit(OpGraph opGraph)
{}
+ @Override
public void visit(OpService opService)
{}
+ @Override
public void visit(OpDatasetNames dsNames)
{}
+ @Override
public void visit(OpTable opUnit)
{}
+ @Override
public void visit(OpExt opExt)
{}
+ @Override
public void visit(OpNull opNull)
{}
+ @Override
public void visit(OpLabel opLabel)
{}
+ @Override
public void visit(OpAssign opAssign)
{}
+ @Override
public void visit(OpExtend opExtend)
{}
+ @Override
public void visit(OpList opList)
{}
+ @Override
public void visit(OpOrder opOrder)
{}
+ @Override
public void visit(OpProject opProject)
{}
+ @Override
public void visit(OpDistinct opDistinct)
{}
+ @Override
public void visit(OpReduced opReduced)
{}
+ @Override
public void visit(OpSlice opSlice)
{}
+ @Override
public void visit(OpGroup opGroup)
{}
+ @Override
public void visit(OpTopN opTop)
{}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVisitorByType.java Wed Oct 19 12:15:05 2011
@@ -36,99 +36,131 @@ public abstract class OpVisitorByType im
protected void visitModifer(OpModifier opMod)
{ visit1(opMod) ; }
+ @Override
public void visit(OpBGP opBGP)
{ visit0(opBGP) ; }
+ @Override
public void visit(OpQuadPattern quadPattern)
{ visit0(quadPattern) ; }
+ @Override
public void visit(OpTriple opTriple)
{ visit0(opTriple) ; }
+ @Override
public void visit(OpPath opPath)
{ visit0(opPath) ; }
+ @Override
public void visit(OpProcedure opProcedure)
{ visit1(opProcedure) ; }
+ @Override
public void visit(OpPropFunc opPropFunc)
{ visit1(opPropFunc) ; }
+ @Override
public void visit(OpJoin opJoin)
{ visit2(opJoin) ; }
+ @Override
public void visit(OpSequence opSequence)
{ visitN(opSequence) ; }
+ @Override
public void visit(OpDisjunction opDisjunction)
{ visitN(opDisjunction) ; }
+ @Override
public void visit(OpLeftJoin opLeftJoin)
{ visit2(opLeftJoin) ; }
+ @Override
public void visit(OpDiff opDiff)
{ visit2(opDiff) ; }
+ @Override
public void visit(OpMinus opMinus)
{ visit2(opMinus) ; }
+ @Override
public void visit(OpUnion opUnion)
{ visit2(opUnion) ; }
+ @Override
public void visit(OpConditional opCond)
{ visit2(opCond) ; }
+ @Override
public void visit(OpFilter opFilter)
{ visit1(opFilter) ; }
+ @Override
public void visit(OpGraph opGraph)
{ visit1(opGraph) ; }
+ @Override
public void visit(OpService opService)
{ visit1(opService) ; }
+ @Override
public void visit(OpDatasetNames dsNames)
{ visit0(dsNames) ; }
+ @Override
public void visit(OpTable opUnit)
{ visit0(opUnit) ; }
+ @Override
public void visit(OpExt opExt)
{ visitExt(opExt) ; }
+ @Override
public void visit(OpNull opNull)
{ visit0(opNull) ; }
+ @Override
public void visit(OpLabel opLabel)
{ visit1(opLabel) ; }
+ @Override
public void visit(OpAssign opAssign)
{ visit1(opAssign) ; }
+ @Override
public void visit(OpExtend opExtend)
{ visit1(opExtend) ; }
+ @Override
public void visit(OpList opList)
{ visitModifer(opList) ; }
+ @Override
public void visit(OpOrder opOrder)
{ visitModifer(opOrder) ; }
+ @Override
public void visit(OpProject opProject)
{ visitModifer(opProject) ; }
+ @Override
public void visit(OpReduced opReduced)
{ visitModifer(opReduced) ; }
+ @Override
public void visit(OpDistinct opDistinct)
{ visitModifer(opDistinct) ; }
+ @Override
public void visit(OpSlice opSlice)
{ visitModifer(opSlice) ; }
+ @Override
public void visit(OpGroup opGroup)
{ visit1(opGroup) ; }
+ @Override
public void visit(OpTopN opTop)
{ visit1(opTop) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformBase.java Wed Oct 19 12:15:05 2011
@@ -24,44 +24,76 @@ import com.hp.hpl.jena.sparql.algebra.op
public class TransformBase implements Transform
{
+ @Override
public Op transform(OpTable opTable) { return opTable ; }
+ @Override
public Op transform(OpBGP opBGP) { return opBGP ; }
+ @Override
public Op transform(OpTriple opTriple) { return opTriple ; }
+ @Override
public Op transform(OpPath opPath) { return opPath ; }
+ @Override
public Op transform(OpProcedure opProc, Op subOp) { return opProc ; }
+ @Override
public Op transform(OpPropFunc opPropFunc, Op subOp) { return opPropFunc ; }
+ @Override
public Op transform(OpDatasetNames dsNames) { return dsNames ; }
+ @Override
public Op transform(OpQuadPattern quadPattern) { return quadPattern ; }
+ @Override
public Op transform(OpFilter opFilter, Op subOp) { return opFilter ; }
+ @Override
public Op transform(OpGraph opGraph, Op subOp) { return opGraph ; }
+ @Override
public Op transform(OpService opService, Op subOp) { return opService ; }
+ @Override
public Op transform(OpAssign opAssign, Op subOp) { return opAssign ; }
+ @Override
public Op transform(OpExtend opExtend, Op subOp) { return opExtend ; }
+ @Override
public Op transform(OpJoin opJoin, Op left, Op right) { return opJoin ; }
+ @Override
public Op transform(OpLeftJoin opLeftJoin, Op left, Op right) { return opLeftJoin ; }
+ @Override
public Op transform(OpDiff opDiff, Op left, Op right) { return opDiff ; }
+ @Override
public Op transform(OpMinus opMinus, Op left, Op right) { return opMinus ; }
+ @Override
public Op transform(OpUnion opUnion, Op left, Op right) { return opUnion ; }
+ @Override
public Op transform(OpConditional opCond, Op left, Op right) { return opCond ; }
+ @Override
public Op transform(OpSequence opSequence, List<Op> elts) { return opSequence ; }
+ @Override
public Op transform(OpDisjunction opDisjunction, List<Op> elts) { return opDisjunction ; }
+ @Override
public Op transform(OpExt opExt) { return opExt ; }
+ @Override
public Op transform(OpNull opNull) { return opNull ; }
+ @Override
public Op transform(OpLabel opLabel, Op subOp) { return opLabel ; }
+ @Override
public Op transform(OpList opList, Op subOp) { return opList ; }
+ @Override
public Op transform(OpOrder opOrder, Op subOp) { return opOrder ; }
+ @Override
public Op transform(OpTopN opTop, Op subOp) { return opTop ; }
+ @Override
public Op transform(OpProject opProject, Op subOp) { return opProject ; }
+ @Override
public Op transform(OpDistinct opDistinct, Op subOp) { return opDistinct ; }
+ @Override
public Op transform(OpReduced opReduced, Op subOp) { return opReduced ; }
+ @Override
public Op transform(OpSlice opSlice, Op subOp) { return opSlice ; }
+ @Override
public Op transform(OpGroup opGroup, Op subOp) { return opGroup ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java Wed Oct 19 12:15:05 2011
@@ -34,45 +34,77 @@ public class TransformCopy implements Tr
public TransformCopy() { this(COPY_ONLY_ON_CHANGE) ; }
public TransformCopy(boolean alwaysDuplicate) { this.alwaysCopy = alwaysDuplicate ; }
+ @Override
public Op transform(OpTable opTable) { return xform(opTable) ; }
+ @Override
public Op transform(OpBGP opBGP) { return xform(opBGP) ; }
+ @Override
public Op transform(OpQuadPattern opQuadPattern) { return xform(opQuadPattern) ; }
+ @Override
public Op transform(OpTriple opTriple) { return xform(opTriple) ; }
+ @Override
public Op transform(OpPath opPath) { return xform(opPath) ; }
+ @Override
public Op transform(OpProcedure opProc, Op subOp) { return xform(opProc, subOp) ; }
+ @Override
public Op transform(OpPropFunc opPropFunc, Op subOp) { return xform(opPropFunc, subOp) ; }
+ @Override
public Op transform(OpDatasetNames opDatasetNames) { return xform(opDatasetNames) ; }
+ @Override
public Op transform(OpFilter opFilter, Op subOp) { return xform(opFilter, subOp) ; }
+ @Override
public Op transform(OpGraph opGraph, Op subOp) { return xform(opGraph, subOp) ; }
+ @Override
public Op transform(OpService opService, Op subOp) { return xform(opService, subOp) ; }
+ @Override
public Op transform(OpAssign opAssign, Op subOp) { return xform(opAssign, subOp) ; }
+ @Override
public Op transform(OpExtend opExtend, Op subOp) { return xform(opExtend, subOp) ; }
+ @Override
public Op transform(OpJoin opJoin, Op left, Op right) { return xform(opJoin, left, right) ; }
+ @Override
public Op transform(OpLeftJoin opLeftJoin, Op left, Op right) { return xform(opLeftJoin, left, right) ; }
+ @Override
public Op transform(OpDiff opDiff, Op left, Op right) { return xform(opDiff, left, right) ; }
+ @Override
public Op transform(OpMinus opMinus, Op left, Op right) { return xform(opMinus, left, right) ; }
+ @Override
public Op transform(OpUnion opUnion, Op left, Op right) { return xform(opUnion, left, right) ; }
+ @Override
public Op transform(OpConditional opCond, Op left, Op right) { return xform(opCond, left, right) ; }
+ @Override
public Op transform(OpSequence opSequence, List<Op> elts) { return xform(opSequence, elts) ; }
+ @Override
public Op transform(OpDisjunction opDisjunction, List<Op> elts) { return xform(opDisjunction, elts) ; }
+ @Override
public Op transform(OpExt opExt) { return opExt ; }
+ @Override
public Op transform(OpNull opNull) { return opNull.copy() ; }
+ @Override
public Op transform(OpLabel opLabel, Op subOp) { return xform(opLabel, subOp) ; }
+ @Override
public Op transform(OpList opList, Op subOp) { return xform(opList, subOp) ; }
+ @Override
public Op transform(OpOrder opOrder, Op subOp) { return xform(opOrder, subOp) ; }
+ @Override
public Op transform(OpTopN opTop, Op subOp) { return xform(opTop, subOp) ; }
+ @Override
public Op transform(OpProject opProject, Op subOp) { return xform(opProject, subOp) ; }
+ @Override
public Op transform(OpDistinct opDistinct, Op subOp) { return xform(opDistinct, subOp) ; }
+ @Override
public Op transform(OpReduced opReduced, Op subOp) { return xform(opReduced, subOp) ; }
+ @Override
public Op transform(OpSlice opSlice, Op subOp) { return xform(opSlice, subOp) ; }
+ @Override
public Op transform(OpGroup opGroup, Op subOp) { return xform(opGroup, subOp) ; }
private Op xform(Op0 op)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformWrapper.java Wed Oct 19 12:15:05 2011
@@ -32,44 +32,76 @@ public class TransformWrapper implements
this.transform = transform ;
}
+ @Override
public Op transform(OpTable opTable) { return transform.transform(opTable) ; }
+ @Override
public Op transform(OpBGP opBGP) { return transform.transform(opBGP) ; }
+ @Override
public Op transform(OpTriple opTriple) { return transform.transform(opTriple) ; }
+ @Override
public Op transform(OpPath opPath) { return transform.transform(opPath) ; }
+ @Override
public Op transform(OpProcedure opProc, Op subOp) { return transform.transform(opProc, subOp) ; }
+ @Override
public Op transform(OpPropFunc opPropFunc, Op subOp) { return transform.transform(opPropFunc, subOp) ; }
+ @Override
public Op transform(OpDatasetNames dsNames) { return transform.transform(dsNames) ; }
+ @Override
public Op transform(OpQuadPattern quadPattern) { return transform.transform(quadPattern) ; }
+ @Override
public Op transform(OpFilter opFilter, Op subOp) { return transform.transform(opFilter, subOp) ; }
+ @Override
public Op transform(OpGraph opGraph, Op subOp) { return transform.transform(opGraph, subOp) ; }
+ @Override
public Op transform(OpService opService, Op subOp) { return transform.transform(opService, subOp) ; }
+ @Override
public Op transform(OpAssign opAssign, Op subOp) { return transform.transform(opAssign, subOp) ; }
+ @Override
public Op transform(OpExtend opExtend, Op subOp) { return transform.transform(opExtend, subOp) ; }
+ @Override
public Op transform(OpJoin opJoin, Op left, Op right) { return transform.transform(opJoin, left, right) ; }
+ @Override
public Op transform(OpLeftJoin opLeftJoin, Op left, Op right) { return transform.transform(opLeftJoin, left, right) ; }
+ @Override
public Op transform(OpDiff opDiff, Op left, Op right) { return transform.transform(opDiff, left, right) ; }
+ @Override
public Op transform(OpMinus opMinus, Op left, Op right) { return transform.transform(opMinus, left, right) ; }
+ @Override
public Op transform(OpUnion opUnion, Op left, Op right) { return transform.transform(opUnion, left, right) ; }
+ @Override
public Op transform(OpConditional opCond, Op left, Op right) { return transform.transform(opCond, left, right) ; }
+ @Override
public Op transform(OpSequence opSequence, List<Op> elts) { return transform.transform(opSequence, elts) ; }
+ @Override
public Op transform(OpDisjunction opDisjunction, List<Op> elts) { return transform.transform(opDisjunction, elts) ; }
+ @Override
public Op transform(OpExt opExt) { return transform.transform(opExt) ; }
+ @Override
public Op transform(OpNull opNull) { return transform.transform(opNull) ; }
+ @Override
public Op transform(OpLabel opLabel, Op subOp) { return transform.transform(opLabel, subOp) ; }
+ @Override
public Op transform(OpList opList, Op subOp) { return transform.transform(opList, subOp) ; }
+ @Override
public Op transform(OpOrder opOrder, Op subOp) { return transform.transform(opOrder, subOp) ; }
+ @Override
public Op transform(OpTopN opTop, Op subOp) { return transform.transform(opTop, subOp) ; }
+ @Override
public Op transform(OpProject opProject, Op subOp) { return transform.transform(opProject, subOp) ; }
+ @Override
public Op transform(OpDistinct opDistinct, Op subOp) { return transform.transform(opDistinct, subOp) ; }
+ @Override
public Op transform(OpReduced opReduced, Op subOp) { return transform.transform(opReduced, subOp) ; }
+ @Override
public Op transform(OpSlice opSlice, Op subOp) { return transform.transform(opSlice, subOp) ; }
+ @Override
public Op transform(OpGroup opGroup, Op subOp) { return transform.transform(opGroup, subOp) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpAssign.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpAssign.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpAssign.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpAssign.java Wed Oct 19 12:15:05 2011
@@ -99,6 +99,7 @@ public class OpAssign extends Op1
assignments = exprs ;
}
+ @Override
public String getName() { return Tags.tagAssign ; }
// Need to protect this with checking for var already used.
@@ -112,6 +113,7 @@ public class OpAssign extends Op1
public int hashCode()
{ return assignments.hashCode() ^ getSubOp().hashCode() ; }
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBGP.java Wed Oct 19 12:15:05 2011
@@ -41,9 +41,11 @@ public class OpBGP extends Op0
public BasicPattern getPattern() { return pattern ; }
+ @Override
public String getName() { return Tags.tagBGP /*.toUpperCase()*/ ; }
@Override
public Op apply(Transform transform) { return transform.transform(this) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy() { return new OpBGP(pattern) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpBase.java Wed Oct 19 12:15:05 2011
@@ -30,6 +30,7 @@ public abstract class OpBase extends Pri
{
@Override
public abstract int hashCode() ;
+ @Override
public abstract boolean equalTo(Op other, NodeIsomorphismMap labelMap) ;
@Override
@@ -48,6 +49,7 @@ public abstract class OpBase extends Pri
output(out, null) ;
}
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
int line = out.getRow() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpConditional.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpConditional.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpConditional.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpConditional.java Wed Oct 19 12:15:05 2011
@@ -43,6 +43,7 @@ public class OpConditional extends Op2 /
public Op apply(Transform transform, Op left, Op right)
{ return transform.transform(this, left, right) ; }
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
@@ -57,6 +58,7 @@ public class OpConditional extends Op2 /
return super.sameArgumentsAs((OpConditional)op2, labelMap) ;
}
+ @Override
public String getName()
{
return Tags.tagConditional ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDatasetNames.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDatasetNames.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDatasetNames.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDatasetNames.java Wed Oct 19 12:15:05 2011
@@ -35,10 +35,12 @@ public class OpDatasetNames extends Op0
return graphNode ;
}
+ @Override
public String getName() { return "DatasetNames" ; }
@Override
public Op apply(Transform transform) { return transform.transform(this) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy() { return new OpDatasetNames(graphNode) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDiff.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDiff.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDiff.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDiff.java Wed Oct 19 12:15:05 2011
@@ -33,12 +33,14 @@ public class OpDiff extends Op2
private OpDiff(Op left, Op right) { super(left, right) ; }
+ @Override
public String getName() { return Tags.tagDiff ; }
@Override
public Op apply(Transform transform, Op left, Op right)
{ return transform.transform(this, left, right) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op newLeft, Op newRight)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDisjunction.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDisjunction.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDisjunction.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDisjunction.java Wed Oct 19 12:15:05 2011
@@ -68,8 +68,10 @@ public class OpDisjunction extends OpN
private OpDisjunction(List<Op> elts) { super(elts) ; }
private OpDisjunction() { super() ; }
+ @Override
public String getName() { return Tags.tagDisjunction ; }
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
//{ throw new ARQNotImplemented("OpDisjunction.visit") ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDistinct.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDistinct.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDistinct.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpDistinct.java Wed Oct 19 12:15:05 2011
@@ -40,8 +40,10 @@ public class OpDistinct extends OpModifi
public Op apply(Transform transform, Op subOp)
{ return transform.transform(this, subOp) ; }
+ @Override
public String getName() { return Tags.tagDistinct ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpDistinct(subOp) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExt.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExt.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExt.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExt.java Wed Oct 19 12:15:05 2011
@@ -48,8 +48,10 @@ public abstract class OpExt extends OpBa
*/
public abstract QueryIterator eval(QueryIterator input, ExecutionContext execCxt) ;
+ @Override
public final String getName() { return tag ; }
+ @Override
public final void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExtend.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExtend.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExtend.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpExtend.java Wed Oct 19 12:15:05 2011
@@ -102,6 +102,7 @@ public class OpExtend extends Op1
assignments = exprs ;
}
+ @Override
public String getName() { return Tags.tagExtend ; }
// Need to protect this with checking for var already used.
@@ -115,6 +116,7 @@ public class OpExtend extends Op1
public int hashCode()
{ return assignments.hashCode() ^ getSubOp().hashCode() ; }
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFetch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFetch.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFetch.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFetch.java Wed Oct 19 12:15:05 2011
@@ -51,9 +51,11 @@ public class OpFetch extends OpExt
OpExtRegistry.register(new OpExtBuilder() {
+ @Override
public OpExt make(ItemList argList)
{ return new OpFetch(argList.get(0).getNode()) ; }
+ @Override
public String getTagName()
{ return TagFetch ; }
}) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFilter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFilter.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFilter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpFilter.java Wed Oct 19 12:15:05 2011
@@ -99,12 +99,14 @@ public class OpFilter extends Op1
public ExprList getExprs() { return expressions ; }
+ @Override
public String getName() { return Tags.tagFilter ; }
@Override
public Op apply(Transform transform, Op subOp)
{ return transform.transform(this, subOp) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGraph.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGraph.java Wed Oct 19 12:15:05 2011
@@ -38,10 +38,12 @@ public class OpGraph extends Op1
public Node getNode() { return node ; }
+ @Override
public String getName() { return Tags.tagGraph ; }
@Override
public Op apply(Transform transform, Op op) { return transform.transform(this, op) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op newOp) { return new OpGraph(node, newOp) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGroup.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGroup.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGroup.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpGroup.java Wed Oct 19 12:15:05 2011
@@ -42,10 +42,12 @@ public class OpGroup extends Op1
this.aggregators = aggregators ;
}
+ @Override
public String getName() { return Tags.tagGroupBy ; }
public VarExprList getGroupVars() { return groupVars ; }
public List<ExprAggregator> getAggregators() { return aggregators ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpGroup(subOp, groupVars, aggregators) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpJoin.java Wed Oct 19 12:15:05 2011
@@ -58,12 +58,14 @@ public class OpJoin extends Op2
private OpJoin(Op left, Op right) { super(left, right) ; }
+ @Override
public String getName() { return Tags.tagJoin ; }
@Override
public Op apply(Transform transform, Op left, Op right)
{ return transform.transform(this, left, right) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLabel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLabel.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLabel.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLabel.java Wed Oct 19 12:15:05 2011
@@ -69,6 +69,7 @@ public class OpLabel extends Op1
return x ;
}
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
@@ -76,6 +77,7 @@ public class OpLabel extends Op1
public boolean hasSubOp() { return getSubOp() != null ; }
+ @Override
public String getName()
{
return Tags.tagLabel ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLeftJoin.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLeftJoin.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLeftJoin.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpLeftJoin.java Wed Oct 19 12:15:05 2011
@@ -47,12 +47,14 @@ public class OpLeftJoin extends Op2
}
public ExprList getExprs() { return expressions ; }
+ @Override
public String getName() { return Tags.tagLeftJoin ; }
@Override
public Op apply(Transform transform, Op left, Op right)
{ return transform.transform(this, left, right) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op newLeft, Op newRight)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpList.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpList.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpList.java Wed Oct 19 12:15:05 2011
@@ -33,9 +33,11 @@ public class OpList extends OpModifier
public Op copy(Op subOp)
{ return new OpList(subOp) ; }
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
+ @Override
public String getName() { return Tags.tagToList ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpMinus.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpMinus.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpMinus.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpMinus.java Wed Oct 19 12:15:05 2011
@@ -33,12 +33,14 @@ public class OpMinus extends Op2
private OpMinus(Op left, Op right) { super(left, right) ; }
+ @Override
public String getName() { return Tags.tagMinus ; }
@Override
public Op apply(Transform transform, Op left, Op right)
{ return transform.transform(this, left, right) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op newLeft, Op newRight)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpNull.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpNull.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpNull.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpNull.java Wed Oct 19 12:15:05 2011
@@ -38,8 +38,10 @@ public class OpNull extends Op0
@Override
public Op copy() { return this ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
+ @Override
public String getName()
{
return Tags.tagNull ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpOrder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpOrder.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpOrder.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpOrder.java Wed Oct 19 12:15:05 2011
@@ -38,7 +38,9 @@ public class OpOrder extends OpModifier
public List<SortCondition> getConditions() { return conditions ; }
+ @Override
public String getName() { return Tags.tagOrderBy ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpOrder(subOp, conditions) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPath.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPath.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPath.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPath.java Wed Oct 19 12:15:05 2011
@@ -44,6 +44,7 @@ public class OpPath extends Op0
public TriplePath getTriplePath() { return triplePath ; }
+ @Override
public String getName() { return Tags.tagPath ; }
@Override
@@ -67,6 +68,7 @@ public class OpPath extends Op0
return triplePath.hashCode() ;
}
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class OpProcedure extends Op1
this(Node.createURI(iri), args, op) ;
}
+ @Override
public String getName()
{
return Tags.tagProc ;
@@ -76,6 +77,7 @@ public class OpProcedure extends Op1
return x ;
}
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java Wed Oct 19 12:15:05 2011
@@ -42,7 +42,9 @@ public class OpProject extends OpModifie
public List<Var> getVars() { return vars ; }
+ @Override
public String getName() { return Tags.tagProject ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpProject(subOp, vars) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPropFunc.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPropFunc.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPropFunc.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpPropFunc.java Wed Oct 19 12:15:05 2011
@@ -60,6 +60,7 @@ public class OpPropFunc extends Op1
return transform.transform(this, subOp) ;
}
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
@@ -87,6 +88,7 @@ public class OpPropFunc extends Op1
return getSubOp().equalTo(procFunc.getSubOp(), labelMap) ;
}
+ @Override
public String getName()
{
return Tags.tagPropFunc ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadPattern.java Wed Oct 19 12:15:05 2011
@@ -91,9 +91,11 @@ public class OpQuadPattern extends Op0
public boolean isUnionGraph() { return Quad.isUnionGraph(graphNode) ; }
+ @Override
public String getName() { return Tags.tagQuadPattern ; }
@Override
public Op apply(Transform transform) { return transform.transform(this) ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy() { return new OpQuadPattern(graphNode, triples) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpReduced.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpReduced.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpReduced.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpReduced.java Wed Oct 19 12:15:05 2011
@@ -40,8 +40,10 @@ public class OpReduced extends OpModifie
public Op apply(Transform transform, Op subOp)
{ return transform.transform(this, subOp) ; }
+ @Override
public String getName() { return Tags.tagReduced ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpReduced(subOp) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSequence.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSequence.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSequence.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSequence.java Wed Oct 19 12:15:05 2011
@@ -68,8 +68,10 @@ public class OpSequence extends OpN
private OpSequence() { super() ; }
private OpSequence(List<Op> elts) { super(elts) ; }
+ @Override
public String getName() { return Tags.tagSequence ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpService.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpService.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpService.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpService.java Wed Oct 19 12:15:05 2011
@@ -50,7 +50,9 @@ public class OpService extends Op1
@Override
public Op copy(Op newOp) { return new OpService(serviceNode, newOp, silent) ; }
+ @Override
public String getName() { return Tags.tagService ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
public Node getService() { return serviceNode ; }
public ElementService getServiceElement() { return serviceElement ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSlice.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSlice.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSlice.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpSlice.java Wed Oct 19 12:15:05 2011
@@ -44,7 +44,9 @@ public class OpSlice extends OpModifier
return null ;
}
+ @Override
public String getName() { return Tags.tagSlice ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpSlice(subOp, start, length) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTable.java Wed Oct 19 12:15:05 2011
@@ -51,8 +51,10 @@ public class OpTable extends Op0
public Table getTable()
{ return table ; }
+ @Override
public String getName() { return Tags.tagTable ; }
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTopN.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTopN.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTopN.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTopN.java Wed Oct 19 12:15:05 2011
@@ -43,8 +43,10 @@ public class OpTopN extends OpModifier
public List<SortCondition> getConditions() { return conditions ; }
public int getLimit() { return limit ; }
+ @Override
public String getName() { return Tags.tagTopN ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op subOp) { return new OpTopN(subOp, limit, conditions) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTriple.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTriple.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTriple.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpTriple.java Wed Oct 19 12:15:05 2011
@@ -82,9 +82,11 @@ public class OpTriple extends Op0
return OpBase.HashTriple ^ triple.hashCode() ;
}
+ @Override
public void visit(OpVisitor opVisitor)
{ opVisitor.visit(this) ; }
+ @Override
public String getName()
{
return Tags.tagTriple ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpUnion.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpUnion.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpUnion.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpUnion.java Wed Oct 19 12:15:05 2011
@@ -40,7 +40,9 @@ public class OpUnion extends Op2
public Op apply(Transform transform, Op left, Op right)
{ return transform.transform(this, left, right) ; }
+ @Override
public String getName() { return Tags.tagUnion ; }
+ @Override
public void visit(OpVisitor opVisitor) { opVisitor.visit(this) ; }
@Override
public Op copy(Op newLeft, Op newRight)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java Wed Oct 19 12:15:05 2011
@@ -43,10 +43,12 @@ public class Optimize implements Rewrite
// ----
public static RewriterFactory noOptimizationFactory = new RewriterFactory()
{
+ @Override
public Rewrite create(Context context)
{
return new Rewrite() {
+ @Override
public Op rewrite(Op op)
{
return op ;
@@ -55,6 +57,7 @@ public class Optimize implements Rewrite
public static RewriterFactory stdOptimizationFactory = new RewriterFactory()
{
+ @Override
public Rewrite create(Context context)
{
return new Optimize(context) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java Wed Oct 19 12:15:05 2011
@@ -44,6 +44,7 @@ public class Table1 extends TableBase
this.value = value ;
}
+ @Override
public QueryIterator iterator(ExecutionContext execCxt)
{
// Root binding?
@@ -52,6 +53,7 @@ public class Table1 extends TableBase
return qIter ;
}
+ @Override
public QueryIterator matchRightLeft(Binding bindingLeft, boolean includeOnNoMatch,
ExprList conditions,
ExecutionContext execContext)
@@ -83,6 +85,7 @@ public class Table1 extends TableBase
@Override
public void closeTable() {}
+ @Override
public List<Var> getVars()
{
List<Var> x = new ArrayList<Var>() ;
@@ -90,6 +93,7 @@ public class Table1 extends TableBase
return x ;
}
+ @Override
public List<String> getVarNames()
{
List<String> x = new ArrayList<String>() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableBase.java Wed Oct 19 12:15:05 2011
@@ -32,6 +32,7 @@ public abstract class TableBase implemen
{
protected TableBase() {}
+ @Override
final public
void close()
{
@@ -43,9 +44,11 @@ public abstract class TableBase implemen
final public Table eval(Evaluator evaluator) { return this ; }
+ @Override
public void addBinding(Binding binding)
{ throw new UnsupportedOperationException("Table.add") ; }
+ @Override
public boolean contains(Binding b)
{
QueryIterator qIter = iterator(null) ;
@@ -60,10 +63,13 @@ public abstract class TableBase implemen
} finally { qIter.close() ; }
}
+ @Override
public abstract int size() ;
+ @Override
public abstract boolean isEmpty() ;
+ @Override
public ResultSet toResultSet()
{
QueryIterator qIter = iterator(null) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java Wed Oct 19 12:15:05 2011
@@ -34,11 +34,13 @@ public class TableEmpty extends TableBas
public TableEmpty()
{ }
+ @Override
public QueryIterator iterator(ExecutionContext execCxt)
{
return new QueryIterNullIterator(execCxt) ;
}
+ @Override
public QueryIterator matchRightLeft(Binding bindingLeft, boolean includeOnNoMatch,
ExprList conditions,
ExecutionContext execContext)
@@ -56,8 +58,10 @@ public class TableEmpty extends TableBas
@Override
public void closeTable() { }
+ @Override
public List<String> getVarNames() { return new ArrayList<String>() ; }
+ @Override
public List<Var> getVars() { return new ArrayList<Var>() ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java Wed Oct 19 12:15:05 2011
@@ -73,6 +73,7 @@ public class TableN extends TableBase
// Note - this table is the RIGHT table, and takes a LEFT binding.
+ @Override
public QueryIterator matchRightLeft(Binding bindingLeft, boolean includeOnNoMatch,
ExprList conditions,
ExecutionContext execContext)
@@ -97,6 +98,7 @@ public class TableN extends TableBase
return new QueryIterPlainWrapper(out.iterator(), execContext) ;
}
+ @Override
public QueryIterator iterator(ExecutionContext execCxt)
{
return new QueryIterPlainWrapper(rows.iterator(), execCxt) ;
@@ -109,7 +111,9 @@ public class TableN extends TableBase
// Don't clear the vars in case code later asks for the variables.
}
+ @Override
public List<String> getVarNames() { return Var.varNames(vars) ; }
+ @Override
public List<Var> getVars() { return vars ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java Wed Oct 19 12:15:05 2011
@@ -37,6 +37,7 @@ public class TableUnit extends TableBase
public TableUnit() {}
+ @Override
public QueryIterator iterator(ExecutionContext execCxt)
{
// BindingRoot?
@@ -44,6 +45,7 @@ public class TableUnit extends TableBase
return QueryIterSingleton.create(binding, execCxt) ;
}
+ @Override
public QueryIterator matchRightLeft(Binding bindingLeft, boolean includeOnNoMatch,
ExprList conditions,
ExecutionContext execCxt)
@@ -60,8 +62,10 @@ public class TableUnit extends TableBase
@Override
public boolean isEmpty() { return false ; }
+ @Override
public List<String> getVarNames() { return new ArrayList<String>() ; }
+ @Override
public List<Var> getVars() { return new ArrayList<Var>() ; }
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/BasicPattern.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/BasicPattern.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/BasicPattern.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/BasicPattern.java Wed Oct 19 12:15:05 2011
@@ -60,6 +60,7 @@ public class BasicPattern implements Ite
public void add(int i, Triple t) { triples.add(i, t) ; }
public Triple get(int i) { return triples.get(i) ; }
+ @Override
public Iterator<Triple> iterator() { return triples.listIterator() ; }
public int size() { return triples.size() ; }
public boolean isEmpty() { return triples.isEmpty() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DataSourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DataSourceImpl.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DataSourceImpl.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DataSourceImpl.java Wed Oct 19 12:15:05 2011
@@ -100,15 +100,19 @@ public class DataSourceImpl implements D
}
// Does it matter if this is not the same model each time?
+ @Override
public Model getDefaultModel()
{
return graph2model(dsg.getDefaultGraph()) ;
}
+ @Override
public Lock getLock() { return dsg.getLock() ; }
+ @Override
public DatasetGraph asDatasetGraph() { return dsg ; }
+ @Override
public Model getNamedModel(String uri)
{
Node n = Node.createURI(uri) ;
@@ -118,6 +122,7 @@ public class DataSourceImpl implements D
return graph2model(g) ;
}
+ @Override
public void addNamedModel(String uri, Model model) throws LabelExistsException
{
addToCache(model) ;
@@ -125,6 +130,7 @@ public class DataSourceImpl implements D
dsg.addGraph(n, model.getGraph()) ;
}
+ @Override
public void removeNamedModel(String uri)
{
Node n = Node.createURI(uri) ;
@@ -132,6 +138,7 @@ public class DataSourceImpl implements D
dsg.removeGraph(n) ;
}
+ @Override
public void replaceNamedModel(String uri, Model model)
{
Node n = Node.createURI(uri) ;
@@ -141,6 +148,7 @@ public class DataSourceImpl implements D
dsg.addGraph(n, model.getGraph() ) ;
}
+ @Override
public void setDefaultModel(Model model)
{
removeFromCache(dsg.getDefaultGraph()) ;
@@ -148,6 +156,7 @@ public class DataSourceImpl implements D
dsg.setDefaultGraph(model.getGraph()) ;
}
+ @Override
public boolean containsNamedModel(String uri)
{
Node n = Node.createURI(uri) ;
@@ -155,6 +164,7 @@ public class DataSourceImpl implements D
}
// Don't look in the cache - go direct to source
+ @Override
public Iterator<String> listNames()
{
return NodeUtils.nodesToURIs(dsg.listGraphNodes()) ;
@@ -164,6 +174,7 @@ public class DataSourceImpl implements D
// -------
// Cache models wrapping graph
+ @Override
public void close()
{
dsg.close() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraph.java Wed Oct 19 12:15:05 2011
@@ -131,5 +131,6 @@ public interface DatasetGraph extends Cl
public long size() ;
/** Close the dataset */
+ @Override
public void close() ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBase.java Wed Oct 19 12:15:05 2011
@@ -52,46 +52,46 @@ abstract public class DatasetGraphBase i
protected DatasetGraphBase() {}
- //@Override
+ @Override
public boolean containsGraph(Node graphNode)
{ return contains(graphNode, Node.ANY, Node.ANY, Node.ANY) ; }
- //@Override
+ @Override
public abstract Graph getDefaultGraph() ;
- //@Override
+ @Override
public abstract Graph getGraph(Node graphNode) ;
- //@Override
+ @Override
public void addGraph(Node graphName, Graph graph)
{ throw new UnsupportedOperationException("DatasetGraph.addGraph") ; }
- //@Override
+ @Override
public void removeGraph(Node graphName)
{ throw new UnsupportedOperationException("DatasetGraph.removeGraph") ; }
- //@Override
+ @Override
public void setDefaultGraph(Graph g)
{ throw new UnsupportedOperationException("DatasetGraph.setDefaultGraph") ; }
- //@Override
+ @Override
public void add(Quad quad) { throw new UnsupportedOperationException("DatasetGraph.add(Quad)") ; }
- //@Override
+ @Override
public void delete(Quad quad) { throw new UnsupportedOperationException("DatasetGraph.delete(Quad)") ; }
-// //@Override
+// @Override
// public void add(Node g, Node s, Node p, Node o) { throw new UnsupportedOperationException("DatasetGraph.add(Node, Node, Node, Node)") ; }
//
-// //@Override
+// @Override
// public void delete(Node g, Node s, Node p, Node o) { throw new UnsupportedOperationException("DatasetGraph.delete(Node, Node, Node, Node)") ; }
- //@Override
+ @Override
public void add(Node g, Node s, Node p, Node o) { add(new Quad(g,s,p,o)) ; }
- //@Override
+ @Override
public void delete(Node g, Node s, Node p, Node o) { delete(new Quad(g,s,p,o)) ; }
- //@Override
+ @Override
/** Simple implementation */
public void deleteAny(Node g, Node s, Node p, Node o)
{
@@ -101,22 +101,22 @@ abstract public class DatasetGraphBase i
delete(q) ;
}
- //@Override
+ @Override
public Iterator<Quad> find()
{ return find(Node.ANY, Node.ANY, Node.ANY, Node.ANY) ; }
- //@Override
+ @Override
public Iterator<Quad> find(Quad quad)
{
if ( quad == null )
return find() ;
return find(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ; }
- //@Override
+ @Override
public boolean contains(Quad quad) { return contains(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ; }
- //@Override
+ @Override
public boolean contains(Node g, Node s, Node p , Node o)
{
Iterator<Quad> iter = find(g, s, p, o) ;
@@ -130,27 +130,28 @@ abstract public class DatasetGraphBase i
return g == null || g == Node.ANY ;
}
- //@Override
+ @Override
public boolean isEmpty()
{
return ! contains(Node.ANY, Node.ANY, Node.ANY, Node.ANY) ;
}
- //@Override
+ @Override
public long size() { return -1 ; }
- //@Override
+ @Override
public Lock getLock()
{
return lock ;
}
+ @Override
public Context getContext()
{
return context ;
}
- //@Override
+ @Override
public void close()
{ }
@@ -175,6 +176,7 @@ abstract public class DatasetGraphBase i
protected static Iter<Quad> triples2quads(final Node graphNode, Iterator<Triple> iter)
{
Transform<Triple, Quad> transformNamedGraph = new Transform<Triple, Quad> () {
+ @Override
public Quad convert(Triple triple)
{
return new Quad(graphNode, triple) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphBaseFind.java Wed Oct 19 12:15:05 2011
@@ -39,7 +39,7 @@ abstract public class DatasetGraphBaseFi
protected DatasetGraphBaseFind() {}
/** Implementation of find based on splitting into triples (default graph) and quads (named graph) */
- //@Override
+ @Override
public Iterator<Quad> find(Node g, Node s, Node p , Node o)
{
if ( ! isWildcard(g) )
@@ -55,7 +55,7 @@ abstract public class DatasetGraphBaseFi
return findAny(s, p, o) ;
}
- //@Override
+ @Override
public Iterator<Quad> findNG(Node g, Node s, Node p , Node o)
{
Iterator<Quad> qIter ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphCollection.java Wed Oct 19 12:15:05 2011
@@ -79,7 +79,7 @@ public abstract class DatasetGraphCollec
}
- //@Override
+ @Override
public abstract Iterator<Node> listGraphNodes() ;
protected Graph fetchGraph(Node gn)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphFactory.java Wed Oct 19 12:15:05 2011
@@ -68,6 +68,7 @@ public class DatasetGraphFactory
private static DatasetGraphMaker.GraphMaker memGraphMaker = new DatasetGraphMaker.GraphMaker()
{
+ @Override
public Graph create()
{
return GraphFactory.createDefaultGraph() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMaker.java Wed Oct 19 12:15:05 2011
@@ -29,6 +29,7 @@ public class DatasetGraphMaker extends D
public interface GraphMaker { public Graph create() ; }
private static GraphMaker graphMakerNull = new GraphMaker() {
+ @Override
public Graph create()
{
return null ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java Wed Oct 19 12:15:05 2011
@@ -49,6 +49,7 @@ public class DatasetGraphOne extends Dat
@Override
public Graph getGraph(Node graphNode) { return null ; }
+ @Override
public Iterator<Node> listGraphNodes()
{
return new NullIterator<Node>() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphQuad.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphQuad.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphQuad.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphQuad.java Wed Oct 19 12:15:05 2011
@@ -31,11 +31,13 @@ import com.hp.hpl.jena.graph.Node ;
public abstract class DatasetGraphQuad extends DatasetGraphBase
{
static Transform<Quad, Node> projectGraphName = new Transform<Quad, Node>() {
+ @Override
public Node convert(Quad quad)
{
return quad.getGraph() ;
}} ;
+ @Override
public Iterator<Node> listGraphNodes()
{
Iter<Quad> iter = Iter.iter(find(Node.ANY, Node.ANY, Node.ANY, Node.ANY)) ;
@@ -48,10 +50,10 @@ public abstract class DatasetGraphQuad e
deleteAny(graphName, Node.ANY, Node.ANY, Node.ANY) ;
}
- //@Override
+ @Override
public abstract Iterator<Quad> find(Node g, Node s, Node p, Node o) ;
- //@Override
+ @Override
public abstract Iterator<Quad> findNG(Node g, Node s, Node p, Node o) ;
@Override
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphWrapper.java Wed Oct 19 12:15:05 2011
@@ -35,91 +35,95 @@ public class DatasetGraphWrapper impleme
this.dsg = dsg ;
}
- //@Override
+ @Override
public boolean containsGraph(Node graphNode)
{ return dsg.containsGraph(graphNode) ; }
- //@Override
+ @Override
public Graph getDefaultGraph()
{ return dsg.getDefaultGraph(); }
- //@Override
+ @Override
public Graph getGraph(Node graphNode)
{ return dsg.getGraph(graphNode) ; }
+ @Override
public void addGraph(Node graphName, Graph graph)
{ dsg.addGraph(graphName, graph) ; }
+ @Override
public void removeGraph(Node graphName)
{ dsg.removeGraph(graphName) ; }
+ @Override
public void setDefaultGraph(Graph g)
{ dsg.setDefaultGraph(g) ; }
- //@Override
+ @Override
public Lock getLock()
{ return dsg.getLock() ; }
- //@Override
+ @Override
public Iterator<Node> listGraphNodes()
{ return dsg.listGraphNodes() ; }
- //@Override
+ @Override
public void add(Quad quad)
{ dsg.add(quad) ; }
- //@Override
+ @Override
public void delete(Quad quad)
{ dsg.delete(quad) ; }
- //@Override
+ @Override
public void add(Node g, Node s, Node p, Node o)
{ dsg.add(g, s, p, o) ; }
- //@Override
+ @Override
public void delete(Node g, Node s, Node p, Node o)
{ dsg.delete(g, s, p, o) ; }
+ @Override
public void deleteAny(Node g, Node s, Node p, Node o)
{ dsg.deleteAny(g, s, p, o) ; }
- //@Override
+ @Override
public boolean isEmpty()
{ return dsg.isEmpty() ; }
- //@Override
+ @Override
public Iterator<Quad> find()
{ return dsg.find() ; }
- //@Override
+ @Override
public Iterator<Quad> find(Quad quad)
{ return dsg.find(quad) ; }
- //@Override
+ @Override
public Iterator<Quad> find(Node g, Node s, Node p, Node o)
{ return dsg.find(g, s, p, o) ; }
- //@Override
+ @Override
public Iterator<Quad> findNG(Node g, Node s, Node p, Node o)
{ return dsg.findNG(g, s, p, o) ; }
- //@Override
+ @Override
public boolean contains(Quad quad)
{ return dsg.contains(quad) ; }
- //@Override
+ @Override
public boolean contains(Node g, Node s, Node p, Node o)
{ return dsg.contains(g, s, p, o) ; }
- //@Override
+ @Override
public Context getContext()
{ return dsg.getContext() ; }
- //@Override
+ @Override
public long size()
{ return dsg.size() ; }
- //@Override
+ @Override
public void close()
{ dsg.close() ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java Wed Oct 19 12:15:05 2011
@@ -58,6 +58,7 @@ public class DatasetImpl implements Data
}
/** Return the default model */
+ @Override
public Model getDefaultModel()
{
synchronized(lock)
@@ -68,11 +69,14 @@ public class DatasetImpl implements Data
}
}
+ @Override
public Lock getLock() { return dsg.getLock() ; }
+ @Override
public DatasetGraph asDatasetGraph() { return dsg ; }
/** Return a model for the named graph - repeated calls so not guarantee to return the same Java object */
+ @Override
public Model getNamedModel(String uri)
{
checkGraphName(uri) ;
@@ -96,6 +100,7 @@ public class DatasetImpl implements Data
throw new ARQException("null for graph name") ;
}
+ @Override
public boolean containsNamedModel(String uri)
{
checkGraphName(uri) ;
@@ -108,12 +113,14 @@ public class DatasetImpl implements Data
return dsg.containsGraph(Node.createURI(uri)) ;
}
+ @Override
public void close()
{
cache = null ;
dsg.close();
}
+ @Override
public Iterator<String> listNames()
{
return NodeUtils.nodesToURIs(dsg.listGraphNodes()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java Wed Oct 19 12:15:05 2011
@@ -39,6 +39,7 @@ public class PathBlock implements Iterab
public void add(int i, TriplePath tp) { triplePaths.add(i, tp) ; }
public TriplePath get(int i) { return triplePaths.get(i) ; }
+ @Override
public ListIterator<TriplePath> iterator() { return triplePaths.listIterator() ; }
public int size() { return triplePaths.size() ; }
public boolean isEmpty() { return triplePaths.isEmpty() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java Wed Oct 19 12:15:05 2011
@@ -44,6 +44,7 @@ public class QuadPattern implements Iter
public void add(int i, Quad q) { quads.add(i, q) ; }
public Quad get(int i) { return quads.get(i) ; }
+ @Override
public ListIterator<Quad> iterator() { return quads.listIterator() ; }
public int size() { return quads.size() ; }
public boolean isEmpty() { return quads.isEmpty() ; }