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 2015/12/29 22:02:12 UTC
[1/5] jena git commit: Fixes JENA-1082.
Repository: jena
Updated Branches:
refs/heads/master c81557a18 -> f2b5681c6
Fixes JENA-1082.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2d1e7a02
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2d1e7a02
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2d1e7a02
Branch: refs/heads/master
Commit: 2d1e7a0235f91990f31c00c9242a532783f74866
Parents: b954832
Author: Ramiro Pereira de Magalhães <ra...@gmail.com>
Authored: Tue Dec 29 16:00:07 2015 -0200
Committer: Ramiro Pereira de Magalhães <ra...@gmail.com>
Committed: Tue Dec 29 16:01:45 2015 -0200
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/rdf/model/ModelCon.java | 8 ++++++++
.../main/java/org/apache/jena/rdf/model/impl/ModelCom.java | 4 ++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2d1e7a02/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java b/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
index 87d6215..0a30710 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
@@ -639,6 +639,14 @@ public interface ModelCon {
matches <code>predicate</code>, and O matches the typed literal
corresponding to <code>object</code>.
*/
+ StmtIterator listLiteralStatements(Resource subject, Property predicate, int object );
+
+ /**
+ Answer a statement iterator that will iterate over all the statements
+ (S, P, O) in this model where S matches <code>subject</code>, P
+ matches <code>predicate</code>, and O matches the typed literal
+ corresponding to <code>object</code>.
+ */
StmtIterator listLiteralStatements( Resource subject, Property predicate, float object );
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/2d1e7a02/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
index 8e48855..4207962 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
@@ -538,6 +538,10 @@ implements Model, PrefixMapping, Lock
{ return listStatements( S, P, createTypedLiteral( O ) ); }
@Override
+ public StmtIterator listLiteralStatements( Resource S, Property P, int O )
+ { return listStatements( S, P, createTypedLiteral( O ) ); }
+
+ @Override
public StmtIterator listLiteralStatements( Resource S, Property P, char O )
{ return listStatements( S, P, createTypedLiteral( O ) ); }
[5/5] jena git commit: JENA-1082: Merge commit 'refs/pull/116/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1082: Merge commit 'refs/pull/116/head' of github.com:apache/jena
This closes #116.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f2b5681c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f2b5681c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f2b5681c
Branch: refs/heads/master
Commit: f2b5681c6e0f7aa80dfa8299b429e8b0b22b422a
Parents: 2a3def2 2d1e7a0
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 29 21:00:47 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 29 21:00:47 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/rdf/model/ModelCon.java | 8 ++++++++
.../main/java/org/apache/jena/rdf/model/impl/ModelCom.java | 4 ++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
[2/5] jena git commit: Cosmetic: rename args to "copy" so not hiding
the parent expr1/expr2.
Posted by an...@apache.org.
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/ec02cf27
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ec02cf27
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ec02cf27
Branch: refs/heads/master
Commit: ec02cf274ca07340afdd9cab3bceaaf49f903b9d
Parents: bf4442d
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 29 11:27:43 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 29 20:59:09 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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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/ec02cf27/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) ; }
}
[4/5] jena git commit: Isolate argument list by making it a copy
every time.
Posted by an...@apache.org.
Isolate argument list by making it a copy every time.
Use the unmodifiable wrapper for ExprFunctionN.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2a3def24
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2a3def24
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2a3def24
Branch: refs/heads/master
Commit: 2a3def244d1382ba34bfe7774369b9706ee4790a
Parents: ec02cf2
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 29 12:11:09 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 29 20:59:09 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/sparql/expr/ExprFunction.java | 5 +----
.../main/java/org/apache/jena/sparql/expr/ExprFunctionN.java | 1 -
.../src/main/java/org/apache/jena/sparql/expr/ExprList.java | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2a3def24/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
index 442618a..785d184 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction.java
@@ -33,7 +33,6 @@ public abstract class ExprFunction extends ExprNode
{
protected FunctionLabel funcSymbol ;
protected String opSign ;
- private List<Expr> argList = null ;
protected ExprFunction(String fName) {
funcSymbol = new FunctionLabel(fName) ;
@@ -51,9 +50,7 @@ public abstract class ExprFunction extends ExprNode
// ExprFunctionN overrides this.
public List<Expr> getArgs() {
- if ( argList != null )
- return argList ;
- argList = new ArrayList<>() ;
+ List<Expr> argList = new ArrayList<>(numArgs()) ;
for ( int i = 1 ; i <= numArgs() ; i++ )
argList.add(this.getArg(i)) ;
return argList ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2a3def24/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java
index 76300ad..e9916ee 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunctionN.java
@@ -50,7 +50,6 @@ public abstract class ExprFunctionN extends ExprFunction
return exprList ;
}
-
@Override
public Expr getArg(int i)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/2a3def24/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
index 59fcb3a..a0125fb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java
@@ -93,7 +93,7 @@ public class ExprList implements Iterable<Expr>
public void addAll(ExprList exprs) { expressions.addAll(exprs.getList()) ; }
public void add(Expr expr) { expressions.add(expr) ; }
- public List<Expr> getList() { return expressions ; }
+ public List<Expr> getList() { return Collections.unmodifiableList(expressions) ; }
@Override
public Iterator<Expr> iterator() { return expressions.iterator() ; }
[3/5] jena git commit: Remove out of date and unhelpful comments.
Posted by an...@apache.org.
Remove out of date and unhelpful comments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bf4442d8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bf4442d8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bf4442d8
Branch: refs/heads/master
Commit: bf4442d8efff330d3417e7e0976696f60025745e
Parents: c81557a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Dec 29 11:26:26 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Dec 29 20:59:09 2015 +0000
----------------------------------------------------------------------
.../org/apache/jena/atlas/lib/ArrayUtils.java | 34 ++++----------------
1 file changed, 7 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bf4442d8/jena-base/src/main/java/org/apache/jena/atlas/lib/ArrayUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/ArrayUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/ArrayUtils.java
index d45a107..200b82c 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/ArrayUtils.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/ArrayUtils.java
@@ -28,37 +28,17 @@ public class ArrayUtils
/** Allocate an array of generic type T (initialized to null) */
@SuppressWarnings("unchecked")
- public static <T> T[] alloc(Class<T> cls, int n)
- {
- return (T[])Array.newInstance(cls, n) ;
+ public static <T> T[] alloc(Class<T> cls, int n) {
+ return (T[])Array.newInstance(cls, n);
}
-
- // Compiles but fails at runtime (class cast exception if the reuls is assigned or accessed)
-// @SuppressWarnings("unchecked")
-// T[] array = (T[])new Object[n] ;
-// or is T known
-// @SuppressWarnings("unchecked")
-// Set<T> x[] = new Set[length] ;
-// return array ;
-
- /** Allocation space and copy */
- public static <T> T[] copy(T[] array)
- {
- return copy(array, 0, array.length) ;
+
+ /** Allocation space and copy */
+ public static <T> T[] copy(T[] array) {
+ return copy(array, 0, array.length);
}
/** Allocation space and copy */
- public static <T> T[] copy(T[] array, int start, int finish)
- {
+ public static <T> T[] copy(T[] array, int start, int finish) {
return Arrays.copyOfRange(array, start, finish) ;
-
-// // Java5.
-// // Fails for arrays of length 0;
-// if ( array.length <= start )
-// throw new IllegalArgumentException("Zero length array not supported") ;
-// @SuppressWarnings("unchecked")
-// T[] array2 = (T[])Array.newInstance(array[start].getClass(), finish-start) ;
-// System.arraycopy(array, start, array2, 0, finish-start) ;
-// return array2 ;
}
}