Author: andy
Date: Thu Aug 1 16:31:46 2013
New Revision: 1509318
URL: http://svn.apache.org/r1509318
Log:
Pull out private statics because they can be useful elsewhere.
Added:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Vars.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java?rev=1509318&r1=1509317&r2=1509318&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
Thu Aug 1 16:31:46 2013
@@ -18,6 +18,8 @@
package com.hp.hpl.jena.sparql.algebra ;
+import static com.hp.hpl.jena.sparql.core.Vars.* ;
+
import java.util.ArrayList;
import java.util.Collection ;
import java.util.Iterator ;
@@ -33,7 +35,6 @@ import com.hp.hpl.jena.query.SortConditi
import com.hp.hpl.jena.sparql.algebra.OpWalker.WalkerVisitor ;
import com.hp.hpl.jena.sparql.algebra.op.* ;
import com.hp.hpl.jena.sparql.core.BasicPattern ;
-import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.pfunction.PropFuncArg ;
@@ -386,25 +387,4 @@ public class OpVars
}
}
}
-
- private static void addVarsFromTriple(Collection<Var> acc, Triple t) {
- addVar(acc, t.getSubject()) ;
- addVar(acc, t.getPredicate()) ;
- addVar(acc, t.getObject()) ;
- }
-
- private static void addVarsFromQuad(Collection<Var> acc, Quad q) {
- addVar(acc, q.getSubject()) ;
- addVar(acc, q.getPredicate()) ;
- addVar(acc, q.getObject()) ;
- addVar(acc, q.getGraph()) ;
- }
-
- private static void addVar(Collection<Var> acc, Node n) {
- if (n == null)
- return ;
-
- if (n.isVariable())
- acc.add(Var.alloc(n)) ;
- }
}
Added: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Vars.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Vars.java?rev=1509318&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Vars.java
(added)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Vars.java Thu
Aug 1 16:31:46 2013
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.sparql.core;
+
+import java.util.Collection ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+
+/** Useful operations involving Var */
+public class Vars {
+
+ public static void addVarsFromTriple(Collection<Var> acc, Triple t) {
+ addVar(acc, t.getSubject()) ;
+ addVar(acc, t.getPredicate()) ;
+ addVar(acc, t.getObject()) ;
+ }
+
+ public static void addVarsFromQuad(Collection<Var> acc, Quad q) {
+ addVar(acc, q.getSubject()) ;
+ addVar(acc, q.getPredicate()) ;
+ addVar(acc, q.getObject()) ;
+ addVar(acc, q.getGraph()) ;
+ }
+
+ public static void addVar(Collection<Var> acc, Node n) {
+ if (n == null)
+ return ;
+
+ if (n.isVariable())
+ acc.add(Var.alloc(n)) ;
+ }
+
+}
+
