Cosmetic: rename args to "copy" so not hiding the parent expr1/expr2.
Helps prevent accidentally using wrong arguments. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/cf268309 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/cf268309 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/cf268309 Branch: refs/heads/master Commit: cf268309b44dc22ef925bdca17032c6eb586f975 Parents: 3d5909e Author: Andy Seaborne <[email protected]> Authored: Tue Dec 29 11:27:43 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Tue Dec 29 21:13:05 2015 +0000 ---------------------------------------------------------------------- jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Add.java | 2 +- jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Divide.java | 2 +- jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Equals.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_GreaterThan.java | 2 +- .../java/org/apache/jena/sparql/expr/E_GreaterThanOrEqual.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_LangMatches.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_LessThan.java | 2 +- .../main/java/org/apache/jena/sparql/expr/E_LessThanOrEqual.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_StrAfter.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_StrBefore.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_StrContains.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_StrDatatype.java | 4 +--- .../src/main/java/org/apache/jena/sparql/expr/E_StrEndsWith.java | 2 +- .../src/main/java/org/apache/jena/sparql/expr/E_StrLang.java | 2 +- .../main/java/org/apache/jena/sparql/expr/E_StrStartsWith.java | 2 +- 15 files changed, 15 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Add.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Add.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Add.java index 6a83cde..8d6fc9d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Add.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Add.java @@ -43,5 +43,5 @@ public class E_Add extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_Add(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_Add(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Divide.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Divide.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Divide.java index 95bd6cf..a41cf8c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Divide.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Divide.java @@ -43,5 +43,5 @@ public class E_Divide extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_Divide(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_Divide(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Equals.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Equals.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Equals.java index c3c3543..a57b278 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Equals.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Equals.java @@ -42,5 +42,5 @@ public class E_Equals extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_Equals(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_Equals(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThan.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThan.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThan.java index 9cd44c3..94a69ca 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThan.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThan.java @@ -38,5 +38,5 @@ public class E_GreaterThan extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_GreaterThan(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_GreaterThan(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThanOrEqual.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThanOrEqual.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThanOrEqual.java index 500f61b..1975eb8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThanOrEqual.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_GreaterThanOrEqual.java @@ -39,5 +39,5 @@ public class E_GreaterThanOrEqual extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_GreaterThanOrEqual(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_GreaterThanOrEqual(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangMatches.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangMatches.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangMatches.java index 1442425..bb9cf8a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangMatches.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangMatches.java @@ -37,5 +37,5 @@ public class E_LangMatches extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_LangMatches(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_LangMatches(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThan.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThan.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThan.java index 62ade47..7b2fdae 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThan.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThan.java @@ -38,5 +38,5 @@ public class E_LessThan extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_LessThan(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_LessThan(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThanOrEqual.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThanOrEqual.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThanOrEqual.java index 7c23513..1c91cc0 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThanOrEqual.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LessThanOrEqual.java @@ -38,5 +38,5 @@ public class E_LessThanOrEqual extends ExprFunction2 } @Override - public Expr copy(Expr e1, Expr e2) { return new E_LessThanOrEqual(e1 , e2 ) ; } + public Expr copy(Expr e1, Expr e2) { return new E_LessThanOrEqual(e1 , e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrAfter.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrAfter.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrAfter.java index c70927c..6af0ed8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrAfter.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrAfter.java @@ -34,5 +34,5 @@ public class E_StrAfter extends ExprFunction2 public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strAfter(v1, v2) ; } @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrAfter(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrAfter(e1, e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrBefore.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrBefore.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrBefore.java index 615ed51..e45b4a3 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrBefore.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrBefore.java @@ -34,5 +34,5 @@ public class E_StrBefore extends ExprFunction2 public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strBefore(v1, v2) ; } @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrBefore(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrBefore(e1, e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrContains.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrContains.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrContains.java index da901f4..690dc03 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrContains.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrContains.java @@ -34,5 +34,5 @@ public class E_StrContains extends ExprFunction2 public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strContains(v1, v2) ; } @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrContains(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrContains(e1, e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrDatatype.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrDatatype.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrDatatype.java index 58b8bc1..b48b7d1 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrDatatype.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrDatatype.java @@ -37,8 +37,6 @@ public class E_StrDatatype extends ExprFunction2 return NodeFunctions.strDatatype(v1, v2) ; } - - @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrDatatype(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrDatatype(e1, e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrEndsWith.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrEndsWith.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrEndsWith.java index 748ed3b..9aa484f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrEndsWith.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrEndsWith.java @@ -34,5 +34,5 @@ public class E_StrEndsWith extends ExprFunction2 public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strEndsWith(v1, v2) ; } @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrEndsWith(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrEndsWith(e1, e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java index b9d4666..c3acb6a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java @@ -39,5 +39,5 @@ public class E_StrLang extends ExprFunction2 @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrLang(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrLang(e1, e2) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/cf268309/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrStartsWith.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrStartsWith.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrStartsWith.java index d2d974b..10a2be4 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrStartsWith.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrStartsWith.java @@ -34,5 +34,5 @@ public class E_StrStartsWith extends ExprFunction2 public NodeValue eval(NodeValue v1, NodeValue v2) { return XSDFuncOp.strStartsWith(v1, v2) ; } @Override - public Expr copy(Expr expr1, Expr expr2) { return new E_StrStartsWith(expr1, expr2) ; } + public Expr copy(Expr e1, Expr e2) { return new E_StrStartsWith(e1, e2) ; } }
