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 [6/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/sse/builders/BuilderExpr.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderExpr.java Wed Oct 19 12:15:05 2011
@@ -357,6 +357,7 @@ public class BuilderExpr
final protected Build buildRegex = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, 4, list, "Regex: wanted 2 or 3 arguments") ;
@@ -373,6 +374,7 @@ public class BuilderExpr
// Special
final protected Build buildPlus = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, 3, list, "+: wanted 1 or 2 arguments") ;
@@ -390,6 +392,7 @@ public class BuilderExpr
final protected Build buildMinus = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, 3, list, "-: wanted 1 or 2 arguments") ;
@@ -409,6 +412,7 @@ public class BuilderExpr
final protected Build buildEQ = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "=: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -420,6 +424,7 @@ public class BuilderExpr
final protected Build buildNE = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "!=: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -431,6 +436,7 @@ public class BuilderExpr
final protected Build buildGT = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, ">: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -442,6 +448,7 @@ public class BuilderExpr
final protected Build buildLT = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "<: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -453,6 +460,7 @@ public class BuilderExpr
final protected Build buildLE = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "<=: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -464,6 +472,7 @@ public class BuilderExpr
final protected Build buildGE = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, ">=: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -475,6 +484,7 @@ public class BuilderExpr
final protected Build buildOr = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "||: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -486,6 +496,7 @@ public class BuilderExpr
final protected Build buildAnd = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "&&: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -497,6 +508,7 @@ public class BuilderExpr
final protected Build buildMult = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "*: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -508,6 +520,7 @@ public class BuilderExpr
final protected Build buildDiv = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "/: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -519,6 +532,7 @@ public class BuilderExpr
final protected Build buildNot = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "!: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -529,6 +543,7 @@ public class BuilderExpr
final protected Build buildStr = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "str: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -539,6 +554,7 @@ public class BuilderExpr
final protected Build buildStrLang = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "strlang: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -550,6 +566,7 @@ public class BuilderExpr
final protected Build buildStrDatatype = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "strlang: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -561,6 +578,7 @@ public class BuilderExpr
final protected Build buildRand = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(1, list, "rand: wanted 0 arguments: got: "+numArgs(list)) ;
@@ -570,6 +588,7 @@ public class BuilderExpr
final protected Build buildYear = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "year: wanted 1 argument: got: "+numArgs(list)) ;
@@ -580,6 +599,7 @@ public class BuilderExpr
final protected Build buildMonth = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "month: wanted 1 argument: got: "+numArgs(list)) ;
@@ -590,6 +610,7 @@ public class BuilderExpr
final protected Build buildDay = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "day: wanted 1 argument: got: "+numArgs(list)) ;
@@ -600,6 +621,7 @@ public class BuilderExpr
final protected Build buildHours = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "hours: wanted 1 argument: got: "+numArgs(list)) ;
@@ -610,6 +632,7 @@ public class BuilderExpr
final protected Build buildMinutes = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "minutes: wanted 1 argument: got: "+numArgs(list)) ;
@@ -620,6 +643,7 @@ public class BuilderExpr
final protected Build buildSeconds = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "seconds: wanted 1 argument: got: "+numArgs(list)) ;
@@ -630,6 +654,7 @@ public class BuilderExpr
final protected Build buildTimezone = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "timezone: wanted 1 argument: got: "+numArgs(list)) ;
@@ -640,6 +665,7 @@ public class BuilderExpr
final protected Build buildTZ = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "TZ: wanted 1 argument: got: "+numArgs(list)) ;
@@ -650,6 +676,7 @@ public class BuilderExpr
final protected Build buildNow = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(1, list, "now: wanted 0 arguments: got: "+numArgs(list)) ;
@@ -659,6 +686,7 @@ public class BuilderExpr
final protected Build buildUUID = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(1, list, "uuid: wanted 0 arguments: got: "+numArgs(list)) ;
@@ -668,6 +696,7 @@ public class BuilderExpr
final protected Build buildVersion = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(1, list, "version: wanted 0 arguments: got: "+numArgs(list)) ;
@@ -677,6 +706,7 @@ public class BuilderExpr
final protected Build buildMD5 = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "md5: wanted 1 argument: got: "+numArgs(list)) ;
@@ -687,6 +717,7 @@ public class BuilderExpr
final protected Build buildSHA1 = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "md5: wanted 1 argument: got: "+numArgs(list)) ;
@@ -697,6 +728,7 @@ public class BuilderExpr
final protected Build buildSHA224 = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "md5: wanted 1 argument: got: "+numArgs(list)) ;
@@ -707,6 +739,7 @@ public class BuilderExpr
final protected Build buildSHA256 = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "md5: wanted 1 argument: got: "+numArgs(list)) ;
@@ -717,6 +750,7 @@ public class BuilderExpr
final protected Build buildSHA384 = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "md5: wanted 1 argument: got: "+numArgs(list)) ;
@@ -727,6 +761,7 @@ public class BuilderExpr
final protected Build buildSHA512 = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "md5: wanted 1 argument: got: "+numArgs(list)) ;
@@ -737,6 +772,7 @@ public class BuilderExpr
final protected Build buildStrlen = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "strlen: wanted 1 argument: got: "+numArgs(list)) ;
@@ -747,6 +783,7 @@ public class BuilderExpr
final protected Build buildSubstr = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3,4, list, "substr: wanted 2 or 3 arguments: got: "+numArgs(list)) ;
@@ -761,6 +798,7 @@ public class BuilderExpr
final protected Build buildStrReplace = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(4, 5, list, "replace: wanted 3 or 4 arguments: got: "+numArgs(list)) ;
@@ -776,6 +814,7 @@ public class BuilderExpr
final protected Build buildStrUppercase = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "ucase: wanted 1 argument: got: "+numArgs(list)) ;
@@ -786,6 +825,7 @@ public class BuilderExpr
final protected Build buildStrLowercase = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "lcase: wanted 1 argument: got: "+numArgs(list)) ;
@@ -796,6 +836,7 @@ public class BuilderExpr
final protected Build buildStrEnds = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "strends: wanted 2 arguments: got: "+numArgs(list)) ;
@@ -807,6 +848,7 @@ public class BuilderExpr
final protected Build buildStrStarts = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "strstarts: wanted 2 arguments: got: "+numArgs(list)) ;
@@ -818,6 +860,7 @@ public class BuilderExpr
final protected Build buildStrBefore = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "strbefore: wanted 2 arguments: got: "+numArgs(list)) ;
@@ -829,6 +872,7 @@ public class BuilderExpr
final protected Build buildStrAfter = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "strafter: wanted 2 arguments: got: "+numArgs(list)) ;
@@ -842,6 +886,7 @@ public class BuilderExpr
final protected Build buildStrContains = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "contains: wanted 2 arguments: got: "+numArgs(list)) ;
@@ -853,6 +898,7 @@ public class BuilderExpr
final protected Build buildStrEncode = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "encode: wanted 1 argument: got: "+numArgs(list)) ;
@@ -863,6 +909,7 @@ public class BuilderExpr
final protected Build buildNumAbs = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "abs: wanted 1 argument: got: "+numArgs(list)) ;
@@ -873,6 +920,7 @@ public class BuilderExpr
final protected Build buildNumRound = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "round: wanted 1 argument: got: "+numArgs(list)) ;
@@ -883,6 +931,7 @@ public class BuilderExpr
final protected Build buildNumCeiling = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "ceiling: wanted 1 argument: got: "+numArgs(list)) ;
@@ -893,6 +942,7 @@ public class BuilderExpr
final protected Build buildNumFloor = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "floor: wanted 1 argument: got: "+numArgs(list)) ;
@@ -902,6 +952,7 @@ public class BuilderExpr
final protected Build buildLang = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "lang: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -912,6 +963,7 @@ public class BuilderExpr
final protected Build buildLangMatches = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "langmatches: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -923,6 +975,7 @@ public class BuilderExpr
final protected Build buildSameTerm = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(3, list, "sameterm: wanted 2 arguments: got :"+numArgs(list)) ;
@@ -934,6 +987,7 @@ public class BuilderExpr
final protected Build buildDatatype = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "datatype: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -944,6 +998,7 @@ public class BuilderExpr
final protected Build buildBound = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "bound: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -954,6 +1009,7 @@ public class BuilderExpr
final protected Build buildCoalesce = new Build()
{
+ @Override
public Expr make(ItemList list)
{
ExprList exprs = buildExprListUntagged(list, 1) ;
@@ -963,6 +1019,7 @@ public class BuilderExpr
final protected Build buildConcat = new Build()
{
+ @Override
public Expr make(ItemList list)
{
ExprList exprs = buildExprListUntagged(list, 1) ;
@@ -972,6 +1029,7 @@ public class BuilderExpr
final protected Build buildConditional = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(4, list, "IF: wanted 3 arguments: got :"+numArgs(list)) ;
@@ -984,6 +1042,7 @@ public class BuilderExpr
final protected Build buildIsIRI = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "isIRI: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -994,6 +1053,7 @@ public class BuilderExpr
final protected Build buildIsURI = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "isURI: wanted 1 arguments: got :"+numArgs(list)) ;
@@ -1004,6 +1064,7 @@ public class BuilderExpr
final protected Build buildIsBlank = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "isBlank: wanted 1 arguments: got: "+numArgs(list)) ;
@@ -1014,6 +1075,7 @@ public class BuilderExpr
final protected Build buildIsLiteral = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "isLiteral: wanted 1 arguments: got: "+numArgs(list)) ;
@@ -1024,6 +1086,7 @@ public class BuilderExpr
final protected Build buildExists = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "exists: wanted 1 arguments: got: "+numArgs(list)) ;
@@ -1034,6 +1097,7 @@ public class BuilderExpr
final protected Build buildNotExists = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "notexists: wanted 1 arguments: got: "+numArgs(list)) ;
@@ -1044,6 +1108,7 @@ public class BuilderExpr
final protected Build buildBNode = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(1, 2, list, "bnode: wanted 0 or 1 arguments: got: "+numArgs(list)) ;
@@ -1057,6 +1122,7 @@ public class BuilderExpr
final protected Build buildIri = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "iri: wanted 1 argument: got: "+numArgs(list)) ;
@@ -1067,6 +1133,7 @@ public class BuilderExpr
final protected Build buildUri = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(2, list, "uri: wanted 1 argument: got: "+numArgs(list)) ;
@@ -1079,6 +1146,7 @@ public class BuilderExpr
final protected Build buildIn = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLengthAtLeast(1, list, "in: wanted 1 or more arguments: got: "+numArgs(list)) ;
@@ -1091,6 +1159,7 @@ public class BuilderExpr
final protected Build buildNotIn = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLengthAtLeast(1, list, "notin: wanted 1 or more arguments: got: "+numArgs(list)) ;
@@ -1119,6 +1188,7 @@ public class BuilderExpr
// All the one expression cases
static abstract class BuildAggCommon implements Build
{
+ @Override
public final Expr make(ItemList list)
{
ItemList x = list.cdr(); // drop "sum"
@@ -1136,6 +1206,7 @@ public class BuilderExpr
final protected Build buildCount = new Build()
{
+ @Override
public Expr make(final ItemList list)
{
ItemList x = list.cdr(); // drop "count"
@@ -1209,6 +1280,7 @@ public class BuilderExpr
final protected Build buildGroupConcat = new Build()
{
+ @Override
public Expr make(final ItemList list)
{
ItemList x = list.cdr(); // drop "group_concat"
@@ -1241,6 +1313,7 @@ public class BuilderExpr
final protected Build buildAggNull = new Build()
{
+ @Override
public Expr make(ItemList list)
{
BuilderLib.checkLength(1, list, "Broken syntax: "+list.shortString()) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderOp.java Wed Oct 19 12:15:05 2011
@@ -227,6 +227,7 @@ public class BuilderOp
// Or assign null and create object on first call but that breaks add/remove
final protected Build buildTable = new Build()
{
+ @Override
public Op make(ItemList list)
{
Item t = Item.createList(list) ;
@@ -237,6 +238,7 @@ public class BuilderOp
final protected Build buildBGP = new Build()
{
+ @Override
public Op make(ItemList list)
{
BasicPattern triples = buildBGP(list) ;
@@ -246,6 +248,7 @@ public class BuilderOp
final protected Build buildQuadPattern = new Build()
{
+ @Override
public Op make(ItemList list)
{
Node g = null ;
@@ -273,6 +276,7 @@ public class BuilderOp
} ;
final protected Build buildTriple = new Build(){
+ @Override
public Op make(ItemList list)
{
Triple t = BuilderGraph.buildTriple(list) ;
@@ -281,6 +285,7 @@ public class BuilderOp
final protected Build buildTriplePath = new Build(){
+ @Override
public Op make(ItemList list)
{
TriplePath tp = BuilderPath.buildTriplePath(list) ;
@@ -289,6 +294,7 @@ public class BuilderOp
final protected Build buildFilter = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "Malformed filter") ;
@@ -303,6 +309,7 @@ public class BuilderOp
final protected Build buildJoin = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "Join") ;
@@ -325,6 +332,7 @@ public class BuilderOp
final protected Build buildSequence = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLengthAtLeast(2, list, "Sequence") ;
@@ -336,6 +344,7 @@ public class BuilderOp
final protected Build buildDisjunction = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLengthAtLeast(2, list, "Disjunction") ;
@@ -347,6 +356,7 @@ public class BuilderOp
final protected Build buildLeftJoin = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, 4, list, "leftjoin: wanted 2 or 3 arguments") ;
@@ -369,6 +379,7 @@ public class BuilderOp
final protected Build buildDiff = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, 4, list, "diff: wanted 2 arguments") ;
@@ -381,6 +392,7 @@ public class BuilderOp
final protected Build buildMinus = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, 4, list, "minus: wanted 2 arguments") ;
@@ -393,6 +405,7 @@ public class BuilderOp
final protected Build buildUnion = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "union") ;
@@ -405,6 +418,7 @@ public class BuilderOp
final protected Build buildConditional = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(2, 3, list, "condition") ;
@@ -420,6 +434,7 @@ public class BuilderOp
final protected Build buildGraph = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "graph") ;
@@ -431,6 +446,7 @@ public class BuilderOp
final protected Build buildService = new Build()
{
+ @Override
public Op make(ItemList list)
{
boolean silent = false ;
@@ -457,6 +473,7 @@ public class BuilderOp
final protected Build buildProcedure = new Build()
{
+ @Override
public Op make(ItemList list)
{
// (proc <foo> (args) form)
@@ -473,6 +490,7 @@ public class BuilderOp
final protected Build buildPropertyFunction = new Build()
{
+ @Override
public Op make(ItemList list)
{
// (proc <foo> (subject args) (object args) form)
@@ -501,6 +519,7 @@ public class BuilderOp
final protected Build buildToList = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(2, list, "tolist") ;
@@ -514,6 +533,7 @@ public class BuilderOp
final protected Build buildGroupBy = new Build()
{
// See buildProject
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, 4, list, "Group") ;
@@ -548,6 +568,7 @@ public class BuilderOp
final protected Build buildOrderBy = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "Order") ;
@@ -591,6 +612,7 @@ public class BuilderOp
final protected Build buildTopN = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, Tags.tagTopN) ;
@@ -616,6 +638,7 @@ public class BuilderOp
final protected Build buildProject = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "project") ;
@@ -628,6 +651,7 @@ public class BuilderOp
final protected Build buildDistinct = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(2, list, "distinct") ;
@@ -638,6 +662,7 @@ public class BuilderOp
final protected Build buildReduced = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(2, list, "reduced") ;
@@ -648,6 +673,7 @@ public class BuilderOp
final protected Build buildAssign = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "assign") ;
@@ -659,6 +685,7 @@ public class BuilderOp
final protected Build buildExtend = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(3, list, "extend") ;
@@ -672,6 +699,7 @@ public class BuilderOp
final protected Build buildSlice = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(4, list, "slice") ;
@@ -690,6 +718,7 @@ public class BuilderOp
final protected Build buildNull = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(1, list, Tags.tagNull) ;
@@ -699,6 +728,7 @@ public class BuilderOp
final protected Build buildLabel = new Build()
{
+ @Override
public Op make(ItemList list)
{
BuilderLib.checkLength(2, 3, list, Tags.tagLabel) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderPath.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderPath.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderPath.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/builders/BuilderPath.java Wed Oct 19 12:15:05 2011
@@ -122,6 +122,7 @@ public class BuilderPath
final protected Build buildNotOneOf = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLengthAtLeast(1, list, "path: negative property set: must be at least one element") ;
@@ -141,6 +142,7 @@ public class BuilderPath
final protected Build buildSeq = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(3, 3, list, "path seq: wanted 2 arguments") ;
@@ -152,6 +154,7 @@ public class BuilderPath
final protected Build buildAlt = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(3, 3, list, "path alt: wanted 2 arguments") ;
@@ -164,6 +167,7 @@ public class BuilderPath
final protected Build buildMod = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(4, 4, list, "path mod: wanted 3 arguments") ;
@@ -183,6 +187,7 @@ public class BuilderPath
final protected Build buildFixedLength = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(3, 3, list, "path fixed repeat: wanted 2 arguments") ;
@@ -194,6 +199,7 @@ public class BuilderPath
final protected Build buildZeroOrMore = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(2, 2, list, "path ZeroOrMore: wanted 1 argument") ;
@@ -204,6 +210,7 @@ public class BuilderPath
final protected Build buildZeroOrOne = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(2, 2, list, "path ZeroOrOne: wanted 1 argument") ;
@@ -214,6 +221,7 @@ public class BuilderPath
final protected Build buildOneOrMore = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(2, 2, list, "path OneOrMore: wanted 1 argument") ;
@@ -224,6 +232,7 @@ public class BuilderPath
final protected Build buildReverse = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(2, 2, list, "path reverse: wanted 1 argument") ;
@@ -234,6 +243,7 @@ public class BuilderPath
final protected Build buildRev = new Build()
{
+ @Override
public Path make(ItemList list)
{
BuilderLib.checkLength(2, 2, list, "path reverse link: wanted 1 argument") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandler2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandler2.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandler2.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandler2.java Wed Oct 19 12:15:05 2011
@@ -34,6 +34,7 @@ public class ParseHandler2 implements Pa
this.handler2 = handler2 ;
}
+ @Override
public Item getItem()
{
Item item = handler1.getItem() ;
@@ -42,6 +43,7 @@ public class ParseHandler2 implements Pa
return item ;
}
+ @Override
public void parseStart()
{
handler1.parseStart() ;
@@ -49,12 +51,14 @@ public class ParseHandler2 implements Pa
}
+ @Override
public void parseFinish()
{
handler1.parseFinish() ;
handler2.parseFinish() ;
}
+ @Override
public void listStart(int line, int column)
{
handler1.listStart(line, column) ;
@@ -62,42 +66,49 @@ public class ParseHandler2 implements Pa
}
+ @Override
public void listFinish(int line, int column)
{
handler1.listFinish(line, column) ;
handler2.listFinish(line, column) ;
}
+ @Override
public void emitBNode(int line, int column, String label)
{
handler1.emitBNode(line, column, label) ;
handler2.emitBNode(line, column, label) ;
}
+ @Override
public void emitIRI(int line, int column, String iriStr)
{
handler1.emitIRI(line, column, iriStr) ;
handler2.emitIRI(line, column, iriStr) ;
}
+ @Override
public void emitLiteral(int line, int column, String lex, String lang, String datatype_iri, String datatype_pn)
{
handler1.emitLiteral(line, column, lex, lang, datatype_iri, datatype_pn) ;
handler2.emitLiteral(line, column, lex, lang, datatype_iri, datatype_pn) ;
}
+ @Override
public void emitPName(int line, int column, String pname)
{
handler1.emitPName(line, column, pname) ;
handler2.emitPName(line, column, pname) ;
}
+ @Override
public void emitSymbol(int line, int column, String symbol)
{
handler1.emitSymbol(line, column, symbol) ;
handler2.emitSymbol(line, column, symbol) ;
}
+ @Override
public void emitVar(int line, int column, String varName)
{
handler1.emitVar(line, column, varName) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerDebug.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerDebug.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerDebug.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerDebug.java Wed Oct 19 12:15:05 2011
@@ -38,14 +38,18 @@ public class ParseHandlerDebug implement
indent() ;
}
+ @Override
public Item getItem() { return null ; }
+ @Override
public void parseStart()
{ System.out.println("<<<<") ; }
+ @Override
public void parseFinish()
{ System.out.println(">>>>") ; }
+ @Override
public void listStart(int line, int column)
{
start(line, column) ;
@@ -53,6 +57,7 @@ public class ParseHandlerDebug implement
System.out.println("(") ;
}
+ @Override
public void listFinish(int line, int column)
{
count-- ;
@@ -62,6 +67,7 @@ public class ParseHandlerDebug implement
+ @Override
public void emitBNode(int line, int column, String label)
{
start(line, column) ;
@@ -69,12 +75,14 @@ public class ParseHandlerDebug implement
}
+ @Override
public void emitIRI(int line, int column, String iriStr)
{
start(line, column) ;
System.out.println("IRI: "+iriStr) ;
}
+ @Override
public void emitLiteral(int line, int column, String lex, String lang, String datatype_iri, String datatype_pn)
{
start(line, column) ;
@@ -86,18 +94,21 @@ public class ParseHandlerDebug implement
System.out.println("Literal: "+lex+" ^^"+datatype_pn) ;
}
+ @Override
public void emitPName(int line, int column, String pname)
{
start(line, column) ;
System.out.println("PName: "+pname) ;
}
+ @Override
public void emitSymbol(int line, int column, String symbol)
{
start(line, column) ;
System.out.println("Symbol: "+symbol) ;
}
+ @Override
public void emitVar(int line, int column, String varName)
{
start(line, column) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java Wed Oct 19 12:15:05 2011
@@ -45,14 +45,17 @@ public class ParseHandlerPlain implement
private VarAlloc varAllocND = new VarAlloc(ARQConstants.allocSSEAnonVars) ;
private VarAlloc varAllocIntern = new VarAlloc(ARQConstants.allocSSENamedVars) ;
+ @Override
public Item getItem()
{
return currentItem ;
}
+ @Override
public void parseStart()
{ depth = 0 ; }
+ @Override
public void parseFinish()
{
if ( depth != 0 )
@@ -60,6 +63,7 @@ public class ParseHandlerPlain implement
depth = -1 ;
}
+ @Override
public void listStart(int line, int column)
{
ItemList list = new ItemList(line, column) ;
@@ -67,6 +71,7 @@ public class ParseHandlerPlain implement
setCurrentItem(Item.createList(list)) ;
}
+ @Override
public void listFinish(int line, int column)
{
ItemList list = popList() ;
@@ -96,11 +101,13 @@ public class ParseHandlerPlain implement
setCurrentItem(item) ;
}
+ @Override
public void emitSymbol(int line, int column, String symbol)
{
listAdd(Item.createSymbol(symbol, line, column)) ;
}
+ @Override
public void emitVar(int line, int column, String varName)
{
Var var = null ;
@@ -116,6 +123,7 @@ public class ParseHandlerPlain implement
listAdd(item) ;
}
+ @Override
public void emitLiteral(int line, int column, String lexicalForm, String langTag, String datatypeIRI, String datatypePN)
{
Node n = null ;
@@ -134,6 +142,7 @@ public class ParseHandlerPlain implement
listAdd(item) ;
}
+ @Override
final
public void emitBNode(int line, int column, String label)
{
@@ -147,6 +156,7 @@ public class ParseHandlerPlain implement
listAdd(item) ;
}
+ @Override
public void emitIRI(int line, int column, String iriStr)
{
Node n = Node.createURI(iriStr) ;
@@ -154,6 +164,7 @@ public class ParseHandlerPlain implement
listAdd(item) ;
}
+ @Override
public void emitPName(int line, int column, String pname)
{
String iriStr = resolvePrefixedName(pname, line, column) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerWrapper.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerWrapper.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerWrapper.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerWrapper.java Wed Oct 19 12:15:05 2011
@@ -32,56 +32,67 @@ public class ParseHandlerWrapper impleme
this.handler = handler ;
}
+ @Override
public Item getItem()
{
return handler.getItem() ;
}
+ @Override
public void parseStart()
{
handler.parseStart() ;
}
+ @Override
public void parseFinish()
{
handler.parseFinish() ;
}
+ @Override
public void listStart(int line, int column)
{
handler.listStart(line, column) ;
}
+ @Override
public void listFinish(int line, int column)
{
handler.listFinish(line, column) ;
}
+ @Override
public void emitBNode(int line, int column, String label)
{
handler.emitBNode(line, column, label) ;
}
+ @Override
public void emitIRI(int line, int column, String iriStr)
{
handler.emitIRI(line, column, iriStr) ;
}
+ @Override
public void emitLiteral(int line, int column, String lex, String lang, String datatype_iri, String datatype_pn)
{
handler.emitLiteral(line, column, lex, lang, datatype_iri, datatype_pn) ;
}
+ @Override
public void emitPName(int line, int column, String pname)
{
handler.emitPName(line, column, pname) ;
}
+ @Override
public void emitSymbol(int line, int column, String symbol)
{
handler.emitSymbol(line, column, symbol) ;
}
+ @Override
public void emitVar(int line, int column, String varName)
{
handler.emitVar(line, column, varName) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterExpr.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterExpr.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterExpr.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterExpr.java Wed Oct 19 12:15:05 2011
@@ -105,6 +105,7 @@ public class WriterExpr
context = cxt ;
}
+ @Override
public void startVisit() {}
@Override
@@ -136,6 +137,7 @@ public class WriterExpr
out.decIndent() ;
}
+ @Override
public void visit(ExprFunctionOp funcOp)
{
out.print("(") ;
@@ -177,21 +179,25 @@ public class WriterExpr
}
+ @Override
public void visit(NodeValue nv)
{
out.print(nv.asQuotedString(context)) ;
}
+ @Override
public void visit(ExprVar nv)
{
out.print(nv.toPrefixString()) ;
}
+ @Override
public void visit(ExprAggregator eAgg)
{
out.print(eAgg.getAggregator().toPrefixString()) ;
}
+ @Override
public void finishVisit() { out.flush() ; }
private void endLine()
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java Wed Oct 19 12:15:05 2011
@@ -107,6 +107,7 @@ public class WriterOp
final SerializationContext sCxt2 = sCxt ;
WriterBasePrefix.Fmt fmt =
new WriterBasePrefix.Fmt() {
+ @Override
public void format() {op.visit(new OpWriterWorker(iWriter, sCxt2)) ;}
} ;
WriterBasePrefix.output(iWriter, fmt, sCxt2.getPrologue()) ;
@@ -166,6 +167,7 @@ public class WriterOp
finish(op) ;
}
+ @Override
public void visit(OpQuadPattern opQuadP)
{
QuadPattern quads = opQuadP.getPattern() ;
@@ -185,6 +187,7 @@ public class WriterOp
finish(opQuadP) ;
}
+ @Override
public void visit(OpBGP opBGP)
{
if ( opBGP.getPattern().size() == 1 )
@@ -216,11 +219,13 @@ public class WriterOp
}
}
+ @Override
public void visit(OpTriple opTriple)
{
formatTriple(opTriple.getTriple()) ;
}
+ @Override
public void visit(OpPath opPath)
{
//start(opPath, NoNL) ;
@@ -228,6 +233,7 @@ public class WriterOp
//finish(opPath) ;
}
+ @Override
public void visit(OpProcedure opProc)
{
start(opProc, NoNL) ;
@@ -239,6 +245,7 @@ public class WriterOp
finish(opProc) ;
}
+ @Override
public void visit(OpPropFunc opPropFunc)
{
start(opPropFunc, NoNL) ;
@@ -263,30 +270,39 @@ public class WriterOp
WriterNode.output(out, pfArg.getArgList(), sContext) ;
}
+ @Override
public void visit(OpJoin opJoin)
{ visitOp2(opJoin, null) ; }
+ @Override
public void visit(OpSequence opSequence)
{ visitOpN(opSequence) ; }
+ @Override
public void visit(OpDisjunction opDisjunction)
{ visitOpN(opDisjunction) ; }
+ @Override
public void visit(OpLeftJoin opLeftJoin)
{ visitOp2(opLeftJoin, opLeftJoin.getExprs()) ; }
+ @Override
public void visit(OpDiff opDiff)
{ visitOp2(opDiff, null) ; }
+ @Override
public void visit(OpMinus opMinus)
{ visitOp2(opMinus, null) ; }
+ @Override
public void visit(OpUnion opUnion)
{ visitOp2(opUnion, null) ; }
+ @Override
public void visit(OpConditional opCondition)
{ visitOp2(opCondition, null) ; }
+ @Override
public void visit(OpFilter opFilter)
{
start(opFilter, NoNL) ;
@@ -306,6 +322,7 @@ public class WriterOp
finish(opFilter) ;
}
+ @Override
public void visit(OpGraph opGraph)
{
start(opGraph, NoNL) ;
@@ -314,6 +331,7 @@ public class WriterOp
finish(opGraph) ;
}
+ @Override
public void visit(OpService opService)
{
start(opService, NoNL) ;
@@ -324,6 +342,7 @@ public class WriterOp
finish(opService) ;
}
+ @Override
public void visit(OpTable opTable)
{
if ( TableUnit.isJoinUnit(opTable.getTable()) )
@@ -339,6 +358,7 @@ public class WriterOp
finish(opTable) ;
}
+ @Override
public void visit(OpDatasetNames dsNames)
{
start(dsNames, NoNL) ;
@@ -346,6 +366,7 @@ public class WriterOp
finish(dsNames) ;
}
+ @Override
public void visit(OpExt opExt)
{
//start(opExt, NL) ;
@@ -353,9 +374,11 @@ public class WriterOp
//finish(opExt) ;
}
+ @Override
public void visit(OpNull opNull)
{ start(opNull, NoSP) ; finish(opNull) ; }
+ @Override
public void visit(OpLabel opLabel)
{
String x = FmtUtils.stringForString(opLabel.getObject().toString()) ;
@@ -374,11 +397,13 @@ public class WriterOp
}
}
+ @Override
public void visit(OpList opList)
{
visitOp1(opList) ;
}
+ @Override
public void visit(OpGroup opGroup)
{
start(opGroup, NoNL) ;
@@ -412,6 +437,7 @@ public class WriterOp
finish(opGroup) ;
}
+ @Override
public void visit(OpOrder opOrder)
{
start(opOrder, NoNL) ;
@@ -433,6 +459,7 @@ public class WriterOp
finish(opOrder) ;
}
+ @Override
public void visit(OpTopN opTop)
{
start(opTop, NoNL) ;
@@ -486,6 +513,7 @@ public class WriterOp
+ @Override
public void visit(OpProject opProject)
{
start(opProject, NoNL) ;
@@ -495,16 +523,19 @@ public class WriterOp
finish(opProject) ;
}
+ @Override
public void visit(OpDistinct opDistinct)
{
visitOp1(opDistinct) ;
}
+ @Override
public void visit(OpReduced opReduced)
{
visitOp1(opReduced) ;
}
+ @Override
public void visit(OpAssign opAssign)
{
start(opAssign, NoNL) ;
@@ -514,6 +545,7 @@ public class WriterOp
finish(opAssign) ;
}
+ @Override
public void visit(OpExtend opExtend)
{
start(opExtend, NoNL) ;
@@ -523,6 +555,7 @@ public class WriterOp
finish(opExtend) ;
}
+ @Override
public void visit(OpSlice opSlice)
{
start(opSlice, NoNL) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterPath.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterPath.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterPath.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterPath.java Wed Oct 19 12:15:05 2011
@@ -131,12 +131,13 @@ public class WriterPath
out.print(FmtUtils.stringForNode(node, prologue)) ;
}
- //@Override
+ @Override
public void visit(P_Link pathNode)
{
output(pathNode.getNode()) ;
}
+ @Override
public void visit(P_ReverseLink pathNode)
{
out.print("(") ;
@@ -146,7 +147,7 @@ public class WriterPath
out.print(")") ;
}
- //@Override
+ @Override
public void visit(P_NegPropSet pathNotOneOf)
{
out.print("(") ;
@@ -160,13 +161,13 @@ public class WriterPath
out.print(")") ;
}
- //@Override
+ @Override
public void visit(P_Alt pathAlt)
{
visit2(pathAlt, Tags.tagPathAlt) ;
}
- //@Override
+ @Override
public void visit(P_Seq pathSeq)
{
visit2(pathSeq, Tags.tagPathSeq) ;
@@ -185,7 +186,7 @@ public class WriterPath
out.print(")") ;
}
- //@Override
+ @Override
public void visit(P_Mod pathMod)
{
out.print("(") ;
@@ -205,6 +206,7 @@ public class WriterPath
return Long.toString(value) ;
}
+ @Override
public void visit(P_FixedLength path)
{
out.print("(") ;
@@ -216,16 +218,19 @@ public class WriterPath
out.print(")") ;
}
+ @Override
public void visit(P_ZeroOrOne path)
{
writeStarPlusQuery(Tags.tagPathZeroOrOne, path.getSubPath()) ;
}
+ @Override
public void visit(P_ZeroOrMore path)
{
writeStarPlusQuery(Tags.tagPathZeroOrMore, path.getSubPath()) ;
}
+ @Override
public void visit(P_OneOrMore path)
{
writeStarPlusQuery(Tags.tagPathOneOrMore, path.getSubPath()) ;
@@ -250,6 +255,7 @@ public class WriterPath
out.print(")") ;
}
+ @Override
public void visit(P_Inverse reversePath)
{
out.print("(") ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementPathBlock.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementPathBlock.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementPathBlock.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementPathBlock.java Wed Oct 19 12:15:05 2011
@@ -46,17 +46,22 @@ public class ElementPathBlock extends El
public void addTriple(TriplePath tp)
{ pattern.add(tp) ; }
+ @Override
public int mark() { return pattern.size() ; }
+ @Override
public void addTriple(Triple t)
{ addTriplePath(new TriplePath(t)) ; }
+ @Override
public void addTriple(int index, Triple t)
{ addTriplePath(index, new TriplePath(t)) ; }
+ @Override
public void addTriplePath(TriplePath tPath)
{ pattern.add(tPath) ; }
+ @Override
public void addTriplePath(int index, TriplePath tPath)
{ pattern.add(index, tPath) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementTriplesBlock.java Wed Oct 19 12:15:05 2011
@@ -44,17 +44,22 @@ public class ElementTriplesBlock extends
public boolean isEmpty() { return pattern.isEmpty() ; }
+ @Override
public void addTriple(Triple t)
{ pattern.add(t) ; }
+ @Override
public int mark() { return pattern.size() ; }
+ @Override
public void addTriple(int index, Triple t)
{ pattern.add(index, t) ; }
+ @Override
public void addTriplePath(TriplePath path)
{ throw new ARQException("Triples-only collector") ; }
+ @Override
public void addTriplePath(int index, TriplePath path)
{ throw new ARQException("Triples-only collector") ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementVisitorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementVisitorBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementVisitorBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementVisitorBase.java Wed Oct 19 12:15:05 2011
@@ -24,35 +24,51 @@ package com.hp.hpl.jena.sparql.syntax;
public class ElementVisitorBase implements ElementVisitor
{
+ @Override
public void visit(ElementTriplesBlock el) { }
+ @Override
public void visit(ElementFilter el) { }
+ @Override
public void visit(ElementAssign el) { }
+ @Override
public void visit(ElementBind el) { }
+ @Override
public void visit(ElementUnion el) { }
+ @Override
public void visit(ElementDataset el) { }
+ @Override
public void visit(ElementOptional el) { }
+ @Override
public void visit(ElementGroup el) { }
+ @Override
public void visit(ElementNamedGraph el) { }
+ @Override
public void visit(ElementExists el) { }
+ @Override
public void visit(ElementNotExists el) { }
+ @Override
public void visit(ElementMinus el) { }
+ @Override
public void visit(ElementService el) { }
+ @Override
public void visit(ElementFetch el) { }
+ @Override
public void visit(ElementSubQuery el) { }
+ @Override
public void visit(ElementPathBlock el) { }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java Wed Oct 19 12:15:05 2011
@@ -51,26 +51,31 @@ public class ElementWalker
protected ElementVisitor proc ;
protected Walker(ElementVisitor visitor) { proc = visitor ; }
+ @Override
public void visit(ElementTriplesBlock el)
{
proc.visit(el) ;
}
+ @Override
public void visit(ElementFilter el)
{
proc.visit(el) ;
}
+ @Override
public void visit(ElementAssign el)
{
proc.visit(el) ;
}
+ @Override
public void visit(ElementBind el)
{
proc.visit(el) ;
}
+ @Override
public void visit(ElementUnion el)
{
for ( Element e : el.getElements() )
@@ -78,6 +83,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementGroup el)
{
for (Element e : el.getElements())
@@ -85,6 +91,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementOptional el)
{
if ( el.getOptionalElement() != null )
@@ -92,6 +99,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementDataset el)
{
if ( el.getPatternElement() != null )
@@ -99,6 +107,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementNamedGraph el)
{
if ( el.getElement() != null )
@@ -106,6 +115,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementService el)
{
if ( el.getElement() != null )
@@ -113,6 +123,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementFetch el)
{
proc.visit(el) ;
@@ -121,6 +132,7 @@ public class ElementWalker
// EXISTs, NOT EXISTs are really subqueries so don't automatically walk down them.
// NB They also occur in FILTERs via expressions.
+ @Override
public void visit(ElementExists el)
{
// if ( el.getElement() != null )
@@ -128,6 +140,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementNotExists el)
{
// if ( el.getElement() != null )
@@ -135,6 +148,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementMinus el)
{
if ( el.getMinusElement() != null )
@@ -142,6 +156,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementSubQuery el)
{
// Only walk this level.
@@ -151,6 +166,7 @@ public class ElementWalker
proc.visit(el) ;
}
+ @Override
public void visit(ElementPathBlock el)
{
proc.visit(el) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVarsVisitor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVarsVisitor.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVarsVisitor.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVarsVisitor.java Wed Oct 19 12:15:05 2011
@@ -57,10 +57,10 @@ public class PatternVarsVisitor extends
}
// Variables here are non-binding.
- //@Override public void visit(ElementExists el) { }
- //@Override public void visit(ElementNotExists el) { }
- //@Override public void visit(ElementMinus el) { }
- //@Override public void visit(ElementFilter el) { }
+ @Override public void visit(ElementExists el) { }
+ @Override public void visit(ElementNotExists el) { }
+ @Override public void visit(ElementMinus el) { }
+ @Override public void visit(ElementFilter el) { }
@Override
public void visit(ElementNamedGraph el)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/RecursiveElementVisitor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/RecursiveElementVisitor.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/RecursiveElementVisitor.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/RecursiveElementVisitor.java Wed Oct 19 12:15:05 2011
@@ -107,12 +107,14 @@ public class RecursiveElementVisitor imp
// Visitor pattern on Elements
+ @Override
public final void visit(ElementTriplesBlock el)
{
startElement(el) ;
endElement(el) ;
}
+ @Override
public final void visit(ElementDataset el)
{
startElement(el) ;
@@ -120,24 +122,28 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementFilter el)
{
startElement(el) ;
endElement(el) ;
}
+ @Override
public void visit(ElementAssign el)
{
startElement(el) ;
endElement(el) ;
}
+ @Override
public void visit(ElementBind el)
{
startElement(el) ;
endElement(el) ;
}
+ @Override
public final void visit(ElementUnion el)
{
startElement(el) ;
@@ -150,6 +156,7 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementGroup el)
{
startElement(el) ;
@@ -162,6 +169,7 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementOptional el)
{
startElement(el) ;
@@ -170,6 +178,7 @@ public class RecursiveElementVisitor imp
}
+ @Override
public final void visit(ElementNamedGraph el)
{
startElement(el) ;
@@ -177,6 +186,7 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementService el)
{
startElement(el) ;
@@ -184,12 +194,14 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementFetch el)
{
startElement(el) ;
endElement(el) ;
}
+ @Override
public final void visit(ElementExists el)
{
startElement(el) ;
@@ -197,6 +209,7 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementNotExists el)
{
startElement(el) ;
@@ -204,6 +217,7 @@ public class RecursiveElementVisitor imp
endElement(el) ;
}
+ @Override
public final void visit(ElementMinus el)
{
startElement(el) ;
@@ -213,11 +227,13 @@ public class RecursiveElementVisitor imp
+ @Override
public void visit(ElementSubQuery el)
{
startElement(el) ;
endElement(el) ;
}
+ @Override
public void visit(ElementPathBlock el)
{
startElement(el) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/syntax/TripleCollectorBGP.java Wed Oct 19 12:15:05 2011
@@ -33,15 +33,20 @@ public class TripleCollectorBGP implemen
public BasicPattern getBGP() { return bgp ; }
+ @Override
public void addTriple(Triple t) { bgp.add(t) ; }
+ @Override
public int mark() { return bgp.size() ; }
+ @Override
public void addTriple(int index, Triple t) { bgp.add(index, t) ; }
+ @Override
public void addTriplePath(TriplePath path)
{ throw new ARQException("Triples-only collector") ; }
+ @Override
public void addTriplePath(int index, TriplePath path)
{ throw new ARQException("Triples-only collector") ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/Closure.java Wed Oct 19 12:15:05 2011
@@ -214,11 +214,13 @@ public class Closure
public static class ClosureBNode implements ClosureTest
{
+ @Override
public boolean traverse(Resource r)
{
return r.isAnon() ;
}
+ @Override
public boolean includeStmt(Statement s)
{
return true ;
@@ -229,11 +231,13 @@ public class Closure
public static class ClosureReachable implements ClosureTest
{
+ @Override
public boolean traverse(Resource r)
{
return true ;
}
+ @Override
public boolean includeStmt(Statement s)
{
return true ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java Wed Oct 19 12:15:05 2011
@@ -84,6 +84,7 @@ public class NodeUtils
public static Iterator<String> nodesToURIs(Iterator<Node> iter)
{
MapFilter<Node, String> mapper = new MapFilter<Node, String>(){
+ @Override
public String accept(Node x)
{
return x.getURI() ;
@@ -239,6 +240,7 @@ public class NodeUtils
// This is term comparison.
public static EqualityTest sameTerm = new EqualityTest() {
+ @Override
public boolean equal(Node n1, Node n2)
{
return NodeFunctions.sameTerm(n1, n2) ;
@@ -246,6 +248,7 @@ public class NodeUtils
} ;
// This is value comparison
public static EqualityTest sameValue = new EqualityTest() {
+ @Override
public boolean equal(Node n1, Node n2)
{
NodeValue nv1 = NodeValue.makeNode(n1) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java Wed Oct 19 12:15:05 2011
@@ -52,6 +52,7 @@ public class PrefixMapping2 implements P
/** @see com.hp.hpl.jena.shared.PrefixMapping#setNsPrefix(java.lang.String, java.lang.String) */
+ @Override
public PrefixMapping setNsPrefix(String prefix, String uri)
{
pmapLocal.setNsPrefix(prefix, uri) ;
@@ -59,6 +60,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#removeNsPrefix(java.lang.String) */
+ @Override
public PrefixMapping removeNsPrefix(String prefix)
{
pmapLocal.removeNsPrefix(prefix) ;
@@ -68,6 +70,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#setNsPrefixes(com.hp.hpl.jena.shared.PrefixMapping) */
+ @Override
public PrefixMapping setNsPrefixes(PrefixMapping other)
{
pmapLocal.setNsPrefixes(other) ;
@@ -75,6 +78,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#setNsPrefixes(java.util.Map) */
+ @Override
public PrefixMapping setNsPrefixes(Map<String, String> map)
{
pmapLocal.setNsPrefixes(map) ;
@@ -82,6 +86,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#getNsPrefixURI(java.lang.String) */
+ @Override
public String getNsPrefixURI(String prefix)
{
String s = pmapLocal.getNsPrefixURI(prefix) ;
@@ -94,6 +99,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#getNsURIPrefix(java.lang.String) */
+ @Override
public String getNsURIPrefix(String uri)
{
String s = pmapLocal.getNsURIPrefix(uri) ;
@@ -107,6 +113,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#getNsPrefixMap() */
+ @Override
public Map<String, String> getNsPrefixMap() { return getNsPrefixMap(true) ; }
public Map<String, String> getNsPrefixMap(boolean includeGlobalMap)
@@ -123,6 +130,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#expandPrefix(java.lang.String) */
+ @Override
public String expandPrefix(String prefixed)
{
// Returns the unchanged prefixed name if no transformation
@@ -140,6 +148,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#shortForm(java.lang.String) */
+ @Override
public String shortForm(String uri)
{
String s = pmapLocal.shortForm(uri) ;
@@ -152,6 +161,7 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#qnameFor(java.lang.String) */
+ @Override
public String qnameFor(String uri)
{
String s = pmapLocal.qnameFor(uri) ;
@@ -165,12 +175,14 @@ public class PrefixMapping2 implements P
}
/** @see com.hp.hpl.jena.shared.PrefixMapping#lock() */
+ @Override
public PrefixMapping lock()
{
pmapLocal.lock() ;
return this;
}
+ @Override
public PrefixMapping withDefaultMappings(PrefixMapping map)
{
Iterator<Map.Entry<String, String>> it = map.getNsPrefixMap().entrySet().iterator();
@@ -185,6 +197,7 @@ public class PrefixMapping2 implements P
return this;
}
+ @Override
public boolean samePrefixMappingAs(PrefixMapping other)
{
if ( other == null )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/PrintSerializableBase.java Wed Oct 19 12:15:05 2011
@@ -26,6 +26,7 @@ import com.hp.hpl.jena.sparql.engine.Pla
public abstract class PrintSerializableBase implements PrintSerializable
{
+ @Override
public String toString(PrefixMapping pmap)
{ return QueryOutputUtils.toString(this, pmap) ; }
@@ -35,6 +36,7 @@ public abstract class PrintSerializableB
{ return PrintUtils.toString(this) ; }
/** Normally overridden for better information */
+ @Override
public void output(IndentedWriter out)
{
out.print(Plan.startMarker) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/RefBoolean.java Wed Oct 19 12:15:05 2011
@@ -38,6 +38,7 @@ public class RefBoolean
context.addCallback(
new Callback()
{
+ @Override
public synchronized void event(Symbol property)
{
if ( property.equals(monitoredProperty) )
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java Wed Oct 19 12:15:05 2011
@@ -35,6 +35,7 @@ class FindableBasicPattern implements Fi
FindableBasicPattern(BasicPattern triples) { this.triples = triples ; }
+ @Override
public Iterator<Triple> find(Node s, Node p, Node o)
{
if ( s == Node.ANY ) s = null ;
@@ -53,6 +54,7 @@ class FindableBasicPattern implements Fi
return r.iterator() ;
}
+ @Override
public boolean contains(Node s, Node p, Node o)
{
if ( s == Node.ANY ) s = null ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableGraph.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableGraph.java Wed Oct 19 12:15:05 2011
@@ -30,6 +30,7 @@ class FindableGraph implements Findable
FindableGraph(Graph graph) { this.graph = graph ; }
+ @Override
public Iterator<Triple> find(Node s, Node p, Node o)
{
if ( s == null ) s = Node.ANY ;
@@ -38,6 +39,7 @@ class FindableGraph implements Findable
return graph.find(s, p ,o) ;
}
+ @Override
public boolean contains(Node s, Node p, Node o)
{
if ( s == null ) s = Node.ANY ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java Wed Oct 19 12:15:05 2011
@@ -167,6 +167,7 @@ public class GraphContainerUtils
static ContainerOrder order = new ContainerOrder() ;
static private class ContainerOrder implements java.util.Comparator<Integer>
{
+ @Override
public int compare(Integer i1, Integer i2)
{
int index1 = i1.intValue() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java Wed Oct 19 12:15:05 2011
@@ -35,8 +35,10 @@ public abstract class GraphListenerBase
// ToDo: notifyAddGraph, notifyDeleteGraph
public GraphListenerBase() {}
+ @Override
public void notifyAddTriple(Graph g, Triple t) { addEvent(t) ; }
+ @Override
public void notifyAddArray(Graph g, Triple[] triples)
{
for ( int i = 0 ; i < triples.length ; i++ )
@@ -45,28 +47,34 @@ public abstract class GraphListenerBase
// addEvent(t) ;
}
+ @Override
public void notifyAddList(Graph g, List<Triple> triples)
{
notifyAddIterator(g, triples.iterator()) ;
}
+ @Override
public void notifyAddIterator(Graph g, Iterator<Triple> it)
{
for ( ; it.hasNext() ; )
addEvent(it.next()) ;
}
+ @Override
public void notifyAddGraph(Graph g, Graph added)
{}
+ @Override
public void notifyDeleteTriple(Graph g, Triple t)
{ deleteEvent(t) ; }
+ @Override
public void notifyDeleteList(Graph g, List<Triple> triples)
{
notifyDeleteIterator(g, triples.iterator()) ;
}
+ @Override
public void notifyDeleteArray(Graph g, Triple[] triples)
{
for ( int i = 0 ; i < triples.length ; i++ )
@@ -75,12 +83,14 @@ public abstract class GraphListenerBase
// deleteEvent(t) ;
}
+ @Override
public void notifyDeleteIterator(Graph g, Iterator<Triple> it)
{
for ( ; it.hasNext() ; )
deleteEvent(it.next()) ;
}
+ @Override
public void notifyDeleteGraph(Graph g, Graph removed)
{}
@@ -91,6 +101,7 @@ public abstract class GraphListenerBase
// --------
// @Override
+ @Override
public void notifyEvent(Graph source, Object value)
{
if ( value.equals(GraphEvents.startRead) )
@@ -100,11 +111,9 @@ public abstract class GraphListenerBase
//super.notifyEvent(source, value) ;
}
- //@Override
protected void startRead()
{}
- //@Override
protected void finishRead()
{}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/Update.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/Update.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/Update.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/Update.java Wed Oct 19 12:15:05 2011
@@ -32,16 +32,19 @@ public abstract class Update implements
{
public abstract void visit(UpdateVisitor visitor) ;
+ @Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
UpdateWriter.output(this, out, sCxt) ;
}
+ @Override
public void output(IndentedWriter out)
{
UpdateWriter.output(this, out, null) ;
}
+ @Override
public String toString(PrefixMapping pmap)
{ return QueryOutputUtils.toString(this, pmap) ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java Wed Oct 19 12:15:05 2011
@@ -60,6 +60,7 @@ public class UpdateRequest extends Prolo
/** @deprecated Use @link{#getOperations()} instead. */
public List<Update> getUpdates() { return operationsView ; }
+ @Override
public Iterator<Update> iterator()
{
return operationsView.iterator() ;
@@ -69,6 +70,7 @@ public class UpdateRequest extends Prolo
public String toString()
{ return PrintUtils.toString(this) ; }
+ @Override
public void output(IndentedWriter out)
{ UpdateWriter.output(this, out) ; }
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/AbstractDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/AbstractDataBag.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/AbstractDataBag.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/AbstractDataBag.java Wed Oct 19 12:15:05 2011
@@ -52,16 +52,19 @@ public abstract class AbstractDataBag<E>
return (size == 0);
}
+ @Override
public long size()
{
return size;
}
+ @Override
public void addAll(Iterable<? extends E> c)
{
addAll(c.iterator());
}
+ @Override
public void addAll(Iterator<? extends E> it)
{
while (it.hasNext())
@@ -71,6 +74,7 @@ public abstract class AbstractDataBag<E>
}
}
+ @Override
public void send(E item)
{
add(item);
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DefaultDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DefaultDataBag.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DefaultDataBag.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DefaultDataBag.java Wed Oct 19 12:15:05 2011
@@ -78,7 +78,7 @@ public class DefaultDataBag<E> extends A
if (closed) throw new AtlasException("DefaultDataBag is closed, no operations can be performed on it.") ;
}
- //@Override
+ @Override
public void add(E item)
{
checkClosed();
@@ -127,19 +127,19 @@ public class DefaultDataBag<E> extends A
memory = null;
}
- //@Override
+ @Override
public boolean isSorted()
{
return false;
}
- //@Override
+ @Override
public boolean isDistinct()
{
return false;
}
- //@Override
+ @Override
public void flush()
{
if (policy.isThresholdExceeded() && (null != serializer))
@@ -148,7 +148,7 @@ public class DefaultDataBag<E> extends A
}
}
- //@Override
+ @Override
public Iterator<E> iterator()
{
Iterator<E> toReturn;
@@ -198,7 +198,7 @@ public class DefaultDataBag<E> extends A
}
}
- //@Override
+ @Override
public void close()
{
if (!closed)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DistinctDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DistinctDataBag.java?rev=1186146&r1=1186145&r2=1186146&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DistinctDataBag.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/data/DistinctDataBag.java Wed Oct 19 12:15:05 2011
@@ -119,6 +119,7 @@ public class DistinctDataBag<E> extends
return item;
}
+ @Override
public void close()
{
Iter.close(iter);