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/12/23 20:56:50 UTC
svn commit: r1222819 - in /incubator/jena/Jena2/ARQ/trunk/src/main/java:
com/hp/hpl/jena/sparql/algebra/ com/hp/hpl/jena/sparql/engine/main/
com/hp/hpl/jena/sparql/engine/ref/ com/hp/hpl/jena/sparql/expr/
com/hp/hpl/jena/sparql/lang/ com/hp/hpl/jena/sp...
Author: andy
Date: Fri Dec 23 19:56:49 2011
New Revision: 1222819
URL: http://svn.apache.org/viewvc?rev=1222819&view=rev
Log:
Change uses of "Stack" to Deque/ArrayDeque
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/ParserQueryBase.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerForm.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSWriter.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ArrayUtils.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Bytes.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertyUtils.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java Fri Dec 23 19:56:49 2011
@@ -18,8 +18,9 @@
package com.hp.hpl.jena.sparql.algebra;
+import java.util.ArrayDeque ;
import java.util.Collection ;
-import java.util.Stack ;
+import java.util.Deque ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQConstants ;
@@ -44,7 +45,7 @@ public class AlgebraQuad extends Transfo
public static Op quadize(Op op)
{
- final Stack<QuadSlot> stack = new Stack<QuadSlot>() ;
+ final Deque<QuadSlot> stack = new ArrayDeque<QuadSlot>() ;
QuadSlot qSlot = new QuadSlot(Quad.defaultGraphNodeGenerated, Quad.defaultGraphNodeGenerated) ;
stack.push(qSlot) ; // Starting condition
@@ -75,9 +76,9 @@ public class AlgebraQuad extends Transfo
private static class Pusher extends OpVisitorBase
{
- Stack<QuadSlot> stack ;
+ Deque<QuadSlot> stack ;
VarAlloc varAlloc = new VarAlloc(ARQConstants.allocVarQuad) ;
- Pusher(Stack<QuadSlot> stack) { this.stack = stack ; }
+ Pusher(Deque<QuadSlot> stack) { this.stack = stack ; }
@Override
public void visit(OpGraph opGraph)
{
@@ -98,8 +99,8 @@ public class AlgebraQuad extends Transfo
private static class Popper extends OpVisitorBase
{
- Stack<QuadSlot> stack ;
- Popper(Stack<QuadSlot> stack) { this.stack = stack ; }
+ Deque<QuadSlot> stack ;
+ Popper(Deque<QuadSlot> stack) { this.stack = stack ; }
@Override
public void visit(OpGraph opGraph)
{
@@ -112,9 +113,9 @@ public class AlgebraQuad extends Transfo
private static class TransformQuadGraph extends TransformCopy
{
- private Stack<QuadSlot> tracker ;
+ private Deque<QuadSlot> tracker ;
- public TransformQuadGraph(Stack<QuadSlot> tracker) { this.tracker = tracker ; }
+ public TransformQuadGraph(Deque<QuadSlot> tracker) { this.tracker = tracker ; }
private Node getNode() { return tracker.peek().rewriteGraphName ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java Fri Dec 23 19:56:49 2011
@@ -18,15 +18,8 @@
package com.hp.hpl.jena.sparql.algebra;
-import java.util.Collections ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.HashMap ;
-import java.util.Map ;
-import java.util.Stack ;
+import java.util.* ;
-import com.hp.hpl.jena.sparql.core.VarExprList ;
-import com.hp.hpl.jena.sparql.expr.ExprAggregator ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.Query ;
@@ -38,11 +31,8 @@ import com.hp.hpl.jena.sparql.ARQNotImpl
import com.hp.hpl.jena.sparql.algebra.op.* ;
import com.hp.hpl.jena.sparql.core.BasicPattern ;
import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.expr.Expr ;
-import com.hp.hpl.jena.sparql.expr.ExprList ;
-import com.hp.hpl.jena.sparql.expr.ExprTransformCopy;
-import com.hp.hpl.jena.sparql.expr.ExprTransformer;
-import com.hp.hpl.jena.sparql.expr.ExprVar;
+import com.hp.hpl.jena.sparql.core.VarExprList ;
+import com.hp.hpl.jena.sparql.expr.* ;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArg ;
import com.hp.hpl.jena.sparql.syntax.* ;
import com.hp.hpl.jena.sparql.util.graph.GraphList ;
@@ -83,7 +73,7 @@ public class OpAsQuery
private Query query ;
private Element element = null ;
private ElementGroup currentGroup = null ;
- private Stack<ElementGroup> stack = new Stack<ElementGroup>() ;
+ private Deque<ElementGroup> stack = new ArrayDeque<ElementGroup>() ;
private List<Var> projectVars = Collections.emptyList() ;
private Map<Var, Expr> varExpression = new HashMap<Var, Expr>() ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java Fri Dec 23 19:56:49 2011
@@ -18,7 +18,8 @@
package com.hp.hpl.jena.sparql.algebra;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -40,11 +41,7 @@ public class TransformUnionQuery extends
}
// ** SEE AlgebraQuad : Pusher and Popper :share.
-
- // General (unquadified) rewrite to make the default graph the
-
- //Deque in Java 6.
- Stack<Node> currentGraph = new Stack<Node>() ;
+ Deque<Node> currentGraph = new ArrayDeque<Node>() ;
public TransformUnionQuery()
{
@@ -98,8 +95,8 @@ public class TransformUnionQuery extends
static class Pusher extends OpVisitorBase
{
- private Stack<Node> stack ;
- Pusher(Stack<Node> stack) { this.stack = stack ; }
+ private Deque<Node> stack ;
+ Pusher(Deque<Node> stack) { this.stack = stack ; }
@Override
public void visit(OpGraph opGraph)
{
@@ -109,8 +106,8 @@ public class TransformUnionQuery extends
static class Popper extends OpVisitorBase
{
- private Stack<Node> stack ;
- Popper(Stack<Node> stack) { this.stack = stack ; }
+ private Deque<Node> stack ;
+ Popper(Deque<Node> stack) { this.stack = stack ; }
@Override
public void visit(OpGraph opGraph)
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java Fri Dec 23 19:56:49 2011
@@ -18,10 +18,9 @@
package com.hp.hpl.jena.sparql.algebra;
-import java.util.ArrayList ;
-import java.util.Iterator ;
-import java.util.List ;
-import java.util.Stack ;
+import java.util.* ;
+
+import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.query.SortCondition ;
import com.hp.hpl.jena.sparql.algebra.OpWalker.WalkerVisitor ;
@@ -29,12 +28,11 @@ import com.hp.hpl.jena.sparql.algebra.op
import com.hp.hpl.jena.sparql.algebra.optimize.ExprTransformApplyTransform ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.core.VarExprList ;
-import com.hp.hpl.jena.sparql.expr.ExprAggregator ;
import com.hp.hpl.jena.sparql.expr.Expr ;
+import com.hp.hpl.jena.sparql.expr.ExprAggregator ;
import com.hp.hpl.jena.sparql.expr.ExprList ;
import com.hp.hpl.jena.sparql.expr.ExprTransformer ;
import com.hp.hpl.jena.sparql.expr.aggregate.Aggregator ;
-import org.openjena.atlas.logging.Log ;
/** A botton-top application of a transformation of SPARQl algebra */
public class Transformer
@@ -121,7 +119,7 @@ public class Transformer
protected final Transform transform ;
private final ExprTransformApplyTransform exprTransform ;
- private final Stack<Op> stack = new Stack<Op>() ;
+ private final Deque<Op> stack = new ArrayDeque<Op>() ;
protected final Op pop() { return stack.pop(); }
protected final void push(Op op)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/ExecutionDispatch.java Fri Dec 23 19:56:49 2011
@@ -18,19 +18,21 @@
package com.hp.hpl.jena.sparql.engine.main;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
+
+import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.algebra.OpVisitor ;
import com.hp.hpl.jena.sparql.algebra.op.* ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
-import org.openjena.atlas.logging.Log ;
/** Class to provide type-safe execution dispatch using the visitor support of Op */
class ExecutionDispatch implements OpVisitor
{
- private Stack<QueryIterator> stack = new Stack<QueryIterator>() ;
+ private Deque<QueryIterator> stack = new ArrayDeque<QueryIterator>() ;
private OpExecutor opExecutor ;
ExecutionDispatch(OpExecutor exec)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/ref/EvaluatorDispatch.java Fri Dec 23 19:56:49 2011
@@ -18,8 +18,11 @@
package com.hp.hpl.jena.sparql.engine.ref;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import java.util.Iterator ;
-import java.util.Stack ;
+
+import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.QueryExecException ;
@@ -30,7 +33,6 @@ import com.hp.hpl.jena.sparql.algebra.Ta
import com.hp.hpl.jena.sparql.algebra.op.* ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.engine.http.Service ;
-import org.openjena.atlas.logging.Log ;
/** Class to provide type-safe eval() dispatch using the visitor support of Op */
@@ -38,7 +40,7 @@ public class EvaluatorDispatch implement
{
// TODO Clean up: OpGraph, OpDatasetNames (needed?)
- private Stack<Table> stack = new Stack<Table>() ;
+ private Deque<Table> stack = new ArrayDeque<Table>() ;
protected Evaluator evaluator ;
public EvaluatorDispatch(Evaluator evaluator)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/expr/ExprTransformer.java Fri Dec 23 19:56:49 2011
@@ -18,14 +18,12 @@
package com.hp.hpl.jena.sparql.expr;
-import java.util.ArrayList ;
-import java.util.EmptyStackException ;
-import java.util.List ;
-import java.util.Stack ;
+import java.util.* ;
+
+import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.sparql.algebra.Op ;
import com.hp.hpl.jena.sparql.algebra.Transformer ;
-import org.openjena.atlas.logging.Log ;
public class ExprTransformer
{
@@ -71,7 +69,7 @@ public class ExprTransformer
class ApplyExprTransformVisitor implements ExprVisitor
{
private ExprTransform transform ;
- private final Stack<Expr> stack = new Stack<Expr>() ;
+ private final Deque<Expr> stack = new ArrayDeque<Expr>() ;
final Expr result()
{
@@ -183,12 +181,12 @@ public class ExprTransformer
push(stack, e) ;
}
- private static void push(Stack<Expr> stack, Expr value)
+ private static void push(Deque<Expr> stack, Expr value)
{
stack.push(value) ;
}
- private static Expr pop(Stack<Expr> stack)
+ private static Expr pop(Deque<Expr> stack)
{
try {
Expr e = stack.pop();
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/ParserQueryBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/ParserQueryBase.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/ParserQueryBase.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/lang/ParserQueryBase.java Fri Dec 23 19:56:49 2011
@@ -18,9 +18,10 @@
package com.hp.hpl.jena.sparql.lang;
+import java.util.ArrayDeque ;
import java.util.ArrayList ;
+import java.util.Deque ;
import java.util.List ;
-import java.util.Stack ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Query ;
@@ -37,7 +38,7 @@ import com.hp.hpl.jena.update.UpdateRequ
/** Class that has all the parse event operations and other query/update specific things */
public class ParserQueryBase extends ParserBase
{
- private Stack<Query> stack = new Stack<Query>() ;
+ private Deque<Query> stack = new ArrayDeque<Query>() ;
protected Query query ;
public void setQuery(Query q)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/path/PathEval.java Fri Dec 23 19:56:49 2011
@@ -509,7 +509,7 @@ public class PathEval
private void doZeroOrMore(Path path)
{
if ( trace ) System.out.printf("\nZeroOrMore: %s\n", node) ;
- //Stack<Node> visited = new Stack<Node>() ;
+ //Deque<Node> visited = new ArrayDeque<Node>() ;
Set<Node> visited = new HashSet<Node>() ;
ALP(node, path, visited) ;
}
@@ -517,7 +517,7 @@ public class PathEval
private void doOneOrMore(Path path)
{
if ( trace ) System.out.printf("\nOneOrMore: %s\n", node) ;
- //Stack<Node> visited = new Stack<Node>() ;
+ //Deque<Node> visited = new ArrayDeque<Node>() ;
Set<Node> visited = new HashSet<Node>() ;
// Do one step without including.
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/ItemTransformer.java Fri Dec 23 19:56:49 2011
@@ -18,7 +18,8 @@
package com.hp.hpl.jena.sparql.sse;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import com.hp.hpl.jena.graph.Node ;
@@ -36,7 +37,7 @@ public class ItemTransformer
// Why not directly dispatch - and make the "visit" operation return a result
static class TransformerApply implements ItemVisitor
{
- Stack<Item> stack = new Stack<Item>() ;
+ Deque<Item> stack = new ArrayDeque<Item>() ;
private void push(Item item) { stack.push(item) ; }
private Item pop() { return stack.pop() ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerForm.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerForm.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerForm.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerForm.java Fri Dec 23 19:56:49 2011
@@ -18,7 +18,8 @@
package com.hp.hpl.jena.sparql.sse.lang;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemList ;
@@ -171,7 +172,7 @@ public abstract class ParseHandlerForm e
private static class FrameStack
{
- private Stack<Frame> frames = new Stack<Frame>() ;
+ private Deque<Frame> frames = new ArrayDeque<Frame>() ;
boolean isCurrent(ItemList list)
{
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=1222819&r1=1222818&r2=1222819&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 Fri Dec 23 19:56:49 2011
@@ -18,7 +18,10 @@
package com.hp.hpl.jena.sparql.sse.lang;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
+
+import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.TypeMapper ;
@@ -30,7 +33,6 @@ import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemList ;
import com.hp.hpl.jena.sparql.sse.ItemLocation ;
import com.hp.hpl.jena.sparql.sse.SSEParseException ;
-import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.sparql.util.LabelToNodeMap ;
public class ParseHandlerPlain implements ParseHandler
@@ -183,7 +185,7 @@ public class ParseHandlerPlain implement
protected static class ListStack
{
- private Stack<ItemList> stack = new Stack<ItemList>() ;
+ private Deque<ItemList> stack = new ArrayDeque<ItemList>() ;
boolean isEmpty() { return stack.size() == 0 ; }
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java Fri Dec 23 19:56:49 2011
@@ -18,8 +18,9 @@
package com.hp.hpl.jena.sparql.sse.lang;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import java.util.Iterator ;
-import java.util.Stack ;
import org.openjena.atlas.lib.StrUtils ;
@@ -51,7 +52,7 @@ public class ParseHandlerResolver extend
private String topBase = null ;
private Prologue prologue = null ;
private ItemList declList = null ;
- private Stack<Prologue> state = new Stack<Prologue>() ; // Previous prologues (not the current one)
+ private Deque<Prologue> state = new ArrayDeque<Prologue>() ; // Previous prologues (not the current one)
public ParseHandlerResolver(Prologue p)
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/iterator/PushbackIterator.java Fri Dec 23 19:56:49 2011
@@ -18,13 +18,13 @@
package org.openjena.atlas.iterator;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import java.util.Iterator ;
-import java.util.Stack ;
public class PushbackIterator<T> implements Iterator<T>
{
- // Java6 : Deque<T> items = new ArrayDeque<Integer>();
- private Stack<T> items = new Stack<T>() ;
+ private Deque<T> items = new ArrayDeque<T>() ;
private Iterator<T> iter ;
public PushbackIterator(Iterator <T> iter)
@@ -41,14 +41,14 @@ public class PushbackIterator<T> impleme
@Override
public boolean hasNext()
{
- if ( !items.empty() ) return true ;
+ if ( !items.isEmpty() ) return true ;
return iter.hasNext() ;
}
@Override
public T next()
{
- if ( !items.empty() )
+ if ( !items.isEmpty() )
return items.pop() ;
return iter.next() ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSONMaker.java Fri Dec 23 19:56:49 2011
@@ -18,15 +18,10 @@
package org.openjena.atlas.json.io;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
-import org.openjena.atlas.json.JsonArray ;
-import org.openjena.atlas.json.JsonBoolean ;
-import org.openjena.atlas.json.JsonNull ;
-import org.openjena.atlas.json.JsonNumber ;
-import org.openjena.atlas.json.JsonObject ;
-import org.openjena.atlas.json.JsonString ;
-import org.openjena.atlas.json.JsonValue ;
+import org.openjena.atlas.json.* ;
import org.openjena.atlas.lib.InternalErrorException ;
import org.openjena.atlas.logging.Log ;
@@ -38,12 +33,11 @@ public class JSONMaker implements JSONHa
private JsonValue value = null ;
- // java6: s/Stack/ArrayDeque
- private Stack<JsonArray> arrays = new Stack<JsonArray>();
- private Stack<JsonObject> objects = new Stack<JsonObject>();
+ private Deque<JsonArray> arrays = new ArrayDeque<JsonArray>();
+ private Deque<JsonObject> objects = new ArrayDeque<JsonObject>();
// The depth of this stack is the object depth.
- private Stack<String> keys = new Stack<String>();
+ private Deque<String> keys = new ArrayDeque<String>();
public JsonValue jsonValue()
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSWriter.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/json/io/JSWriter.java Fri Dec 23 19:56:49 2011
@@ -19,12 +19,13 @@
package org.openjena.atlas.json.io;
-import static org.openjena.atlas.lib.Chars.CH_QUOTE2 ;
import static org.openjena.atlas.lib.Chars.CH_QUOTE1 ;
+import static org.openjena.atlas.lib.Chars.CH_QUOTE2 ;
import static org.openjena.atlas.lib.Chars.CH_ZERO ;
import java.io.OutputStream ;
-import java.util.Stack ;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
import org.openjena.atlas.io.IndentedLineBuffer ;
import org.openjena.atlas.io.IndentedWriter ;
@@ -60,7 +61,7 @@ public class JSWriter
private static String ObjectPairSep = " : " ;
// Remember whether we are in the first element of a compound (object or array).
- Stack<Ref<Boolean>> stack = new Stack<Ref<Boolean>>() ;
+ Deque<Ref<Boolean>> stack = new ArrayDeque<Ref<Boolean>>() ;
public void startObject()
{
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ArrayUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ArrayUtils.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ArrayUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/ArrayUtils.java Fri Dec 23 19:56:49 2011
@@ -19,6 +19,7 @@
package org.openjena.atlas.lib;
import java.lang.reflect.Array ;
+import java.util.Arrays ;
/** Collection of array-related operations */
public class ArrayUtils
@@ -49,16 +50,15 @@ public class ArrayUtils
/** Allocation space and copy */
public static <T> T[] copy(T[] array, int start, int finish)
{
- // *** Java6.
- //return Arrays.copyOfRange(array, start, 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 ;
+// // 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 ;
}
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Bytes.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Bytes.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Bytes.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/Bytes.java Fri Dec 23 19:56:49 2011
@@ -80,11 +80,7 @@ public class Bytes
public static byte[] copyOf(byte[] bytes)
{
- // Java6: Arrays.copyOf(bytes, bytes.length)
return copyOf(bytes, 0, bytes.length) ;
-// byte[] newByteArray = new byte[bytes.length] ;
-// System.arraycopy(bytes, 0, newByteArray, 0, bytes.length) ;
-// return newByteArray ;
}
public static byte[] copyOf(byte[] bytes, int start)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PoolFiniteBlocking.java Fri Dec 23 19:56:49 2011
@@ -18,57 +18,35 @@
package org.openjena.atlas.lib;
-public class PoolFiniteBlocking<T> implements Pool<T>
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.LinkedBlockingDeque;
+import com.hp.hpl.jena.sparql.ARQException;
+
+/** Finite capacity pool - capacity is fixed at create time */
+public class PoolFiniteBlocking<T> implements Pool<T>
{
- private PoolFiniteBlocking(int size) { throw new NotImplemented() ; }
+ BlockingDeque<T> pool ;
+
+ public PoolFiniteBlocking(int size) { pool = new LinkedBlockingDeque<T>(size) ; }
@Override
- public T get()
+ public final void put(T item)
{
- return null ;
+ pool.addLast(item) ;
}
-
+
@Override
- public boolean isEmpty()
- {
- return false ;
+ public T get()
+ {
+ try
+ {
+ return pool.takeFirst() ;
+ } catch (InterruptedException ex)
+ {
+ throw new ARQException("Failed to get an item from the pool (InterruptedException): "+ex.getMessage()) ;
+ }
}
-
+
@Override
- public void put(T item)
- {}
+ public boolean isEmpty() { return pool.isEmpty() ; }
}
-
-// **** Java6
-//import java.util.concurrent.BlockingDeque;
-//import java.util.concurrent.LinkedBlockingDeque;
-//import com.hp.hpl.jena.sparql.ARQException;
-//
-///** Finite capacity pool - capacity is fixed at create time */
-//public class PoolFiniteBlocking<T> implements Pool<T>
-//{
-// BlockingDeque<T> pool ;
-//
-// public PoolFiniteBlocking(int size) { pool = new LinkedBlockingDeque<T>(size) ; }
-//
-// @Override
-// public final void put(T item)
-// {
-// pool.addLast(item) ;
-// }
-//
-// @Override
-// public T get()
-// {
-// try
-// {
-// return pool.takeFirst() ;
-// } catch (InterruptedException ex)
-// {
-// throw new ARQException("Failed to get an item from the pool (InterruptedException): "+ex.getMessage()) ;
-// }
-// }
-//
-// @Override
-// public boolean isEmpty() { return pool.isEmpty() ; }
-//}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertyUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertyUtils.java?rev=1222819&r1=1222818&r2=1222819&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertyUtils.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/atlas/lib/PropertyUtils.java Fri Dec 23 19:56:49 2011
@@ -18,9 +18,7 @@
package org.openjena.atlas.lib;
-import java.io.ByteArrayInputStream ;
-import java.io.FileOutputStream ;
-import java.io.IOException ;
+import java.io.* ;
import java.util.Properties ;
import org.openjena.atlas.AtlasException ;
@@ -52,11 +50,9 @@ public class PropertyUtils
if ( str == null )
str = filename ;
FileOutputStream fos = new FileOutputStream(filename) ;
-// Writer w = FileUtils.asUTF8(fos) ;
-// w = new BufferedWriter(w) ;
-// //properties.store(w, "Metadata: "+str) ; // Java6.
- // Warning - not UTF-8 safe.
- properties.store(fos, str) ;
+ Writer w = FileUtils.asUTF8(fos) ;
+ w = new BufferedWriter(w) ;
+ properties.store(w, "Metadata: "+str) ; // Java6.
fos.close() ;
}