jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1457500 [1/4] - in /jena/trunk: jena-arq/src-examples/arq/examples/ jena-arq/src-examples/arq/examples/propertyfunction/ jena-arq/src/main/java/arq/ jena-arq/src/main/java/com/hp/hpl/jena/query/ jena-arq/src/main/java/com/hp/hpl/jena/sparq...
Date Sun, 17 Mar 2013 17:48:10 GMT
Author: andy
Date: Sun Mar 17 17:48:00 2013
New Revision: 1457500

URL: http://svn.apache.org/r1457500
Log:
Changes propagating JENA-398: Extract NodeFactory

Added:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java
      - copied, changed from r1454694, jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
Removed:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
Modified:
    jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java
    jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java
    jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/uppercase.java
    jena/trunk/jena-arq/src/main/java/arq/qexpr.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Quad.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueString.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/TemplateLib.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateCreate.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateLoad.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/blankNode.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/concat.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listIndex.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listLength.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/splitIRI.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/str.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/version.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/versionARQ.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVInputIterator.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInput.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInputIterator.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementService.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ExprUtils.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAdapter.java
    jena/trunk/jena-arq/src/test/java/arq/qtest.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/http/TestService.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExpressions.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestXSDFuncOp.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/AbstractTestGraph2.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphsMem.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraph.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/AbstractTestUpdateGraphMgt.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Forms.java
    jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/util/TestList.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeAllocator.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/system/TestChecker.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/web/TestDatasetGraphAccessorBase.java
    jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
    jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/BaseServerTest.java
    jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/graph/GraphSDB.java
    jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout1/CodecSimple.java
    jena/trunk/jena-sdb/src/main/java/com/hp/hpl/jena/sdb/layout2/SQLBridge2.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecLib.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java
    jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TxnDeadlockTest.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestBulkUpdateTDB.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestNodeLib.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestCodec.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestNodeTableBase.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphNamedTDB.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestTripleTable.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java
    jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java

Modified: jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/AlgebraExec.java Sun Mar 17 17:48:00 2013
@@ -23,6 +23,7 @@ import java.util.List ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.query.ResultSetFormatter ;
@@ -58,7 +59,7 @@ public class AlgebraExec
         Var var_z = Var.alloc("z") ;
         
         // ---- Build expression
-        bp.add(new Triple(var_x, Node.createURI(BASE+"p"), var_z)) ;
+        bp.add(new Triple(var_x, NodeFactory.createURI(BASE+"p"), var_z)) ;
         Op op = new OpBGP(bp) ;
         //Expr expr = ExprUtils.parse("?z < 2 ") ;
         Expr expr = new E_LessThan(new ExprVar(var_z), NodeValue.makeNodeInteger(2)) ;

Modified: jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/localname.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import java.util.List ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
@@ -81,7 +82,7 @@ public class localname extends PFuncSimp
             return new QueryIterNullIterator(execCxt) ;
 
         // Subject is bound and a URI - get the localname as a Node 
-        Node localname = Node.createLiteral(nodeURI.getLocalName()) ;
+        Node localname = NodeFactory.createLiteral(nodeURI.getLocalName()) ;
         
         // Object - unbound variable or a value? 
         if ( ! nodeLocalname.isVariable() )
@@ -133,7 +134,7 @@ public class localname extends PFuncSimp
     private void slot(Collection<Binding> bindings, Binding input, Node node, Var subjVar, Node nodeLocalname)
     {
         if ( ! node.isURI() ) return ;
-        Node localname = Node.createLiteral(node.getLocalName()) ;
+        Node localname = NodeFactory.createLiteral(node.getLocalName()) ;
         if ( nodeLocalname.isVariable() )
         {
             // Object is an unbound variable.

Modified: jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/uppercase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/uppercase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/uppercase.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/propertyfunction/uppercase.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package arq.examples.propertyfunction;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.pfunction.PFuncAssignToObject ;
 
 /** Example property function that uppercases the lexical form of a literal.
@@ -44,6 +45,6 @@ public class uppercase extends PFuncAssi
         if ( ! node.isLiteral() ) 
             return null ;
         String str = node.getLiteralLexicalForm().toUpperCase() ;
-        return Node.createLiteral(str) ;
+        return NodeFactory.createLiteral(str) ;
     }
 }

Modified: jena/trunk/jena-arq/src/main/java/arq/qexpr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/qexpr.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/qexpr.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/qexpr.java Sun Mar 17 17:48:00 2013
@@ -44,7 +44,7 @@ import com.hp.hpl.jena.sparql.function.F
 import com.hp.hpl.jena.sparql.sse.WriterSSE ;
 import com.hp.hpl.jena.sparql.util.ExprUtils ;
 import com.hp.hpl.jena.sparql.util.FmtUtils ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 
 /** A program to execute expressions from the command line. */
 
@@ -189,7 +189,7 @@ public class qexpr
                     else
                     {
                         // Default action
-                        ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactory.nowAsDateTime()) ;
+                        ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
                         FunctionEnv env = new ExecutionContext(ARQ.getContext(), null, null, null) ; 
                         NodeValue r = expr.eval(null, env) ;
                         //System.out.println(r.asQuotedString()) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java Sun Mar 17 17:48:00 2013
@@ -41,7 +41,7 @@ import com.hp.hpl.jena.shared.PrefixMapp
 import com.hp.hpl.jena.shared.impl.PrefixMappingImpl;
 import com.hp.hpl.jena.sparql.serializer.SerializationContext;
 import com.hp.hpl.jena.sparql.util.FmtUtils;
-import com.hp.hpl.jena.sparql.util.NodeFactory;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
 import com.hp.hpl.jena.update.UpdateFactory;
 import com.hp.hpl.jena.update.UpdateRequest;
 
@@ -424,7 +424,7 @@ public class ParameterizedSparqlString i
      *            Lexical Value
      */
     public void appendLiteral(String value) {
-        this.appendNode(NodeFactory.createLiteralNode(value, null, null));
+        this.appendNode(NodeFactoryExtra.createLiteralNode(value, null, null));
     }
 
     /**
@@ -437,7 +437,7 @@ public class ParameterizedSparqlString i
      *            Language
      */
     public void appendLiteral(String value, String lang) {
-        this.appendNode(NodeFactory.createLiteralNode(value, lang, null));
+        this.appendNode(NodeFactoryExtra.createLiteralNode(value, lang, null));
     }
 
     /**
@@ -450,7 +450,7 @@ public class ParameterizedSparqlString i
      *            Datatype
      */
     public void appendLiteral(String value, RDFDatatype datatype) {
-        this.appendNode(NodeFactory.createLiteralNode(value, null, datatype.getURI()));
+        this.appendNode(NodeFactoryExtra.createLiteralNode(value, null, datatype.getURI()));
     }
 
     /**
@@ -472,7 +472,7 @@ public class ParameterizedSparqlString i
      *            Integer to append
      */
     public void appendLiteral(int i) {
-        this.appendNode(NodeFactory.intToNode(i));
+        this.appendNode(NodeFactoryExtra.intToNode(i));
     }
 
     /**
@@ -483,7 +483,7 @@ public class ParameterizedSparqlString i
      *            Long to append
      */
     public void appendLiteral(long l) {
-        this.appendNode(NodeFactory.intToNode(l));
+        this.appendNode(NodeFactoryExtra.intToNode(l));
     }
 
     /**
@@ -792,7 +792,7 @@ public class ParameterizedSparqlString i
      * 
      */
     public void setLiteral(int index, String value) {
-        this.setParam(index, NodeFactory.createLiteralNode(value, null, null));
+        this.setParam(index, NodeFactoryExtra.createLiteralNode(value, null, null));
     }
 
     /**
@@ -809,7 +809,7 @@ public class ParameterizedSparqlString i
      * 
      */
     public void setLiteral(String var, String value) {
-        this.setParam(var, NodeFactory.createLiteralNode(value, null, null));
+        this.setParam(var, NodeFactoryExtra.createLiteralNode(value, null, null));
     }
 
     /**
@@ -828,7 +828,7 @@ public class ParameterizedSparqlString i
      * 
      */
     public void setLiteral(int index, String value, String lang) {
-        this.setParam(index, NodeFactory.createLiteralNode(value, lang, null));
+        this.setParam(index, NodeFactoryExtra.createLiteralNode(value, lang, null));
     }
 
     /**
@@ -847,7 +847,7 @@ public class ParameterizedSparqlString i
      * 
      */
     public void setLiteral(String var, String value, String lang) {
-        this.setParam(var, NodeFactory.createLiteralNode(value, lang, null));
+        this.setParam(var, NodeFactoryExtra.createLiteralNode(value, lang, null));
     }
 
     /**
@@ -921,7 +921,7 @@ public class ParameterizedSparqlString i
      *            Integer Value
      */
     public void setLiteral(int index, int i) {
-        this.setParam(index, NodeFactory.intToNode(i));
+        this.setParam(index, NodeFactoryExtra.intToNode(i));
     }
 
     /**
@@ -933,7 +933,7 @@ public class ParameterizedSparqlString i
      *            Integer Value
      */
     public void setLiteral(String var, int i) {
-        this.setParam(var, NodeFactory.intToNode(i));
+        this.setParam(var, NodeFactoryExtra.intToNode(i));
     }
 
     /**
@@ -945,7 +945,7 @@ public class ParameterizedSparqlString i
      *            Integer Value
      */
     public void setLiteral(int index, long l) {
-        this.setParam(index, NodeFactory.intToNode(l));
+        this.setParam(index, NodeFactoryExtra.intToNode(l));
     }
 
     /**
@@ -957,7 +957,7 @@ public class ParameterizedSparqlString i
      *            Integer Value
      */
     public void setLiteral(String var, long l) {
-        this.setParam(var, NodeFactory.intToNode(l));
+        this.setParam(var, NodeFactoryExtra.intToNode(l));
     }
 
     /**
@@ -969,7 +969,7 @@ public class ParameterizedSparqlString i
      *            Float value
      */
     public void setLiteral(int index, float f) {
-        this.setParam(index, NodeFactory.floatToNode(f));
+        this.setParam(index, NodeFactoryExtra.floatToNode(f));
     }
 
     /**
@@ -981,7 +981,7 @@ public class ParameterizedSparqlString i
      *            Float value
      */
     public void setLiteral(String var, float f) {
-        this.setParam(var, NodeFactory.floatToNode(f));
+        this.setParam(var, NodeFactoryExtra.floatToNode(f));
     }
 
     /**

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProcedure.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.algebra.op;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.algebra.Op ;
 import com.hp.hpl.jena.sparql.algebra.OpVisitor ;
 import com.hp.hpl.jena.sparql.algebra.Transform ;
@@ -46,7 +47,7 @@ public class OpProcedure extends Op1
     
     public OpProcedure(String iri, ExprList args, Op op)
     {
-        this(Node.createURI(iri), args, op) ;
+        this(NodeFactory.createURI(iri), args, op) ;
     }
     
     @Override

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetImpl.java Sun Mar 17 17:48:00 2013
@@ -25,6 +25,7 @@ import org.apache.jena.atlas.lib.CacheFa
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.query.Dataset ;
 import com.hp.hpl.jena.query.LabelExistsException ;
 import com.hp.hpl.jena.query.ReadWrite ;
@@ -164,7 +165,7 @@ public class DatasetImpl implements Data
     public Model getNamedModel(String uri)
     { 
         checkGraphName(uri) ;
-        Node n = Node.createURI(uri) ;
+        Node n = NodeFactory.createURI(uri) ;
         synchronized(internalLock)
         {
             Graph g = dsg.getGraph(n) ;
@@ -180,7 +181,7 @@ public class DatasetImpl implements Data
         checkGraphName(uri) ;
         // Assumes single writer.
         addToCache(model) ;
-        Node n = Node.createURI(uri) ;
+        Node n = NodeFactory.createURI(uri) ;
         dsg.addGraph(n, model.getGraph()) ;
     }
 
@@ -188,7 +189,7 @@ public class DatasetImpl implements Data
     public void removeNamedModel(String uri)
     { 
         checkGraphName(uri) ;
-        Node n = Node.createURI(uri) ;
+        Node n = NodeFactory.createURI(uri) ;
         // Assumes single writer.
         removeFromCache(dsg.getGraph(n)) ;
         dsg.removeGraph(n) ;
@@ -199,7 +200,7 @@ public class DatasetImpl implements Data
     {
         // Assumes single writer.
         checkGraphName(uri) ;
-        Node n = Node.createURI(uri) ;
+        Node n = NodeFactory.createURI(uri) ;
         removeFromCache(dsg.getGraph(n)) ;
         dsg.removeGraph(n) ;
         addToCache(model) ;
@@ -220,7 +221,7 @@ public class DatasetImpl implements Data
     { 
         // Does not touch the cache.
         checkGraphName(uri) ;
-        Node n = Node.createURI(uri) ;
+        Node n = NodeFactory.createURI(uri) ;
         return dsg.containsGraph(n) ;
     }
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Quad.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Quad.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Quad.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Quad.java Sun Mar 17 17:48:00 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.core;
 import static org.apache.jena.atlas.lib.Lib.equal ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
 
 public class Quad
@@ -30,16 +31,16 @@ public class Quad
     /** Name of the default graph as used by parsers and in quad form of algebra. 
      *  Not for access to the default graph by name - use Quad.defaultGraphIRI.
      */ 
-    public static final Node defaultGraphNodeGenerated     =  Node.createURI("urn:x-arq:DefaultGraphNode") ;
+    public static final Node defaultGraphNodeGenerated     =  NodeFactory.createURI("urn:x-arq:DefaultGraphNode") ;
     
     // These are convenience constants for other systems to give special
     // interpretation to these "named" graphs.  
     
     /** Name of the default for explict use in GRAPH */
-    public static final Node defaultGraphIRI        =  Node.createURI("urn:x-arq:DefaultGraph") ;
+    public static final Node defaultGraphIRI        =  NodeFactory.createURI("urn:x-arq:DefaultGraph") ;
 
     /** Name of the merge of all named graphs (use this for the graph of all named graphs) */
-    public static final Node unionGraph           =  Node.createURI("urn:x-arq:UnionGraph") ;
+    public static final Node unionGraph           =  NodeFactory.createURI("urn:x-arq:UnionGraph") ;
 
     /** Name of the non-graph when a quad is really a triple - also parsing of triples formats 
      *  (and the default graph when parsing N-Quads or TriG) 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Sun Mar 17 17:48:00 2013
@@ -50,7 +50,7 @@ import com.hp.hpl.jena.sparql.syntax.Tem
 import com.hp.hpl.jena.sparql.util.Context ;
 import com.hp.hpl.jena.sparql.util.DatasetUtils ;
 import com.hp.hpl.jena.sparql.util.ModelUtils ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 import com.hp.hpl.jena.util.FileManager ;
 
 /** All the SPARQL query result forms made from a graph-level execution object */ 
@@ -105,7 +105,7 @@ public class QueryExecutionBase implemen
             // Copy per-dataset settings.
             context.putAll(dataset.getContext()) ;
         
-        context.set(ARQConstants.sysCurrentTime, NodeFactory.nowAsDateTime()) ;
+        context.set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
         
         // Allocators.
 //        context.set(ARQConstants.sysVarAllocNamed, new VarAlloc(ARQConstants.allocVarMarkerExec)) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java Sun Mar 17 17:48:00 2013
@@ -30,6 +30,7 @@ import java.util.List ;
 
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 
 import org.apache.jena.atlas.iterator.IteratorSlotted ;
 import org.apache.jena.atlas.lib.Closeable ;
@@ -174,7 +175,7 @@ public class BindingInputStream extends 
                     if ( token.hasType(TokenType.STAR ) || ( token.isCtlCode() && token.getCntrlCode() == -1 ) )
                         n = lastLine.get(v) ;
                     else if ( token.hasType(TokenType.BNODE) )
-                        n = Node.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(token.getImage()))) ;
+                        n = NodeFactory.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(token.getImage()))) ;
                     else
                         n = profile.create(null, token) ;
                     binding.add(v, n) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/E_BNode.java Sun Mar 17 17:48:00 2013
@@ -22,6 +22,7 @@ import java.util.IdentityHashMap ;
 import java.util.List ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
 import com.hp.hpl.jena.sparql.function.FunctionEnv ;
@@ -52,7 +53,7 @@ public class E_BNode extends ExprFunctio
             expr = getArg(1) ;
 
         if ( expr == null )
-            return NodeValue.makeNode(Node.createAnon()) ;
+            return NodeValue.makeNode(NodeFactory.createAnon()) ;
 
         NodeValue x = expr.eval(binding, env) ;
         if ( ! x.isString() )

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java Sun Mar 17 17:48:00 2013
@@ -176,7 +176,7 @@ public abstract class NodeValue extends 
     
     // Use "==" for equality.
     private static final String strForUnNode = "node value nothing" ;
-    public static final NodeValue nvNothing = NodeValue.makeNode(Node.createAnon(new AnonId("node value nothing"))) ;
+    public static final NodeValue nvNothing = NodeValue.makeNode(com.hp.hpl.jena.graph.NodeFactory.createAnon(new AnonId("node value nothing"))) ;
     
     public static final String xsdNamespace = XSD+"#" ; 
     
@@ -263,7 +263,7 @@ public abstract class NodeValue extends 
     
     /** Convenience operation - parse a string to produce a NodeValue - common namespaces like xsd: are built-in */
     public static NodeValue parse(String string)
-    { return makeNode(NodeFactory.parseNode(string)) ; }
+    { return makeNode(NodeFactoryExtra.parseNode(string)) ; }
     
     public static NodeValue makeInteger(long i)
     { return new NodeValueInteger(BigInteger.valueOf(i)) ; }
@@ -310,7 +310,7 @@ public abstract class NodeValue extends 
     public static NodeValue makeDateTime(XMLGregorianCalendar cal)
     {
         String lex = cal.toXMLFormat() ;
-        Node node = Node.createLiteral(lex, XSDdateTime) ; 
+        Node node = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, XSDdateTime) ; 
         return new NodeValueDT(lex, node) ;
     }
 
@@ -323,7 +323,7 @@ public abstract class NodeValue extends 
     public static NodeValue makeDate(XMLGregorianCalendar cal)
     {
         String lex = cal.toXMLFormat() ;
-        Node node = Node.createLiteral(lex, XSDdate) ; 
+        Node node = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, XSDdate) ; 
         return new NodeValueDT(lex, node) ;
     }
 
@@ -353,7 +353,7 @@ public abstract class NodeValue extends 
                                
     public static NodeValue makeNode(String lexicalForm, XSDDatatype dtype)
     {
-        Node n = Node.createLiteral(lexicalForm, null, dtype) ;
+        Node n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, null, dtype) ;
         NodeValue nv = NodeValue.makeNode(n) ;
         return nv ;
     }
@@ -379,10 +379,10 @@ public abstract class NodeValue extends 
         if ( datatype != null)
         {
             RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatype) ;
-            n = Node.createLiteral(lexicalForm, null, dType) ;
+            n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, null, dType) ;
         }
         else
-            n = Node.createLiteral(lexicalForm, langTag, null) ;
+            n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lexicalForm, langTag, null) ;
         return NodeValue.makeNode(n) ;
     }
     

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeFunctions.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import java.util.UUID ;
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.iri.IRI ;
@@ -180,7 +181,7 @@ public class NodeFunctions
                 return NodeConst.dtRDFlangString ;
             return XSD.xstring.asNode() ;
         }
-        return Node.createURI(s) ;
+        return NodeFactory.createURI(s) ;
     }
     
     // -------- lang
@@ -322,7 +323,7 @@ public class NodeFunctions
         {
             // Skolemization of blank nodes to IRIs : Don't ask, just don't ask.
             String x = nv.getBlankNodeLabel() ;
-            return Node.createURI("_:"+x) ;
+            return NodeFactory.createURI("_:"+x) ;
         }
         
         // Simple literal or xsd:string
@@ -355,7 +356,7 @@ public class NodeFunctions
             }
             Log.warn(NodeFunctions.class, "Bad IRI: "+msg+": "+iri) ;
         }
-        return Node.createURI(iri.toString()) ;
+        return NodeFactory.createURI(iri.toString()) ;
     }
     
     // The Jena version can vbe slow to inityailise (but is pure java)
@@ -383,7 +384,7 @@ public class NodeFunctions
     public static NodeValue uuid()
     {
         String str = "urn:uuid:"+uuidString() ;
-        Node n = Node.createURI(str) ;
+        Node n = NodeFactory.createURI(str) ;
         return NodeValue.makeNode(n) ;
     }
 
@@ -415,7 +416,7 @@ public class NodeFunctions
         Node dt = v2.asNode() ;
         // Check?
         
-        Node n = Node.createLiteral(lex, null, Node.getType(dt.getURI())) ;
+        Node n = NodeFactory.createLiteral(lex, null, NodeFactory.getType(dt.getURI())) ;
         return NodeValue.makeNode(n) ; 
     }
     
@@ -428,7 +429,7 @@ public class NodeFunctions
         String lang = v2.asString() ;
         // Check?
         
-        Node n = Node.createLiteral(lex, lang, null) ;
+        Node n = NodeFactory.createLiteral(lex, lang, null) ;
         return NodeValue.makeNode(n) ; 
     }
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDecimal.java Sun Mar 17 17:48:00 2013
@@ -22,6 +22,7 @@ import java.math.BigDecimal ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 import com.hp.hpl.jena.sparql.util.Utils ;
 
@@ -53,7 +54,7 @@ public class NodeValueDecimal extends No
     protected Node makeNode()
     { 
         int s = decimal.scale() ;
-        return Node.createLiteral(Utils.stringForm(decimal), null, XSDDatatype.XSDdecimal) ;
+        return NodeFactory.createLiteral(Utils.stringForm(decimal), null, XSDDatatype.XSDdecimal) ;
     }
     
     @Override

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDouble.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import java.math.BigDecimal ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 import com.hp.hpl.jena.sparql.util.Utils ;
 
@@ -49,7 +50,7 @@ public class NodeValueDouble extends Nod
 
     @Override
     protected Node makeNode()
-    { return Node.createLiteral(Utils.stringForm(value), null, XSDDatatype.XSDdouble) ; }
+    { return NodeFactory.createLiteral(Utils.stringForm(value), null, XSDDatatype.XSDdouble) ; }
     
     @Override
     public String asString() { return toString() ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDuration.java Sun Mar 17 17:48:00 2013
@@ -22,6 +22,7 @@ import javax.xml.datatype.Duration ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 
 /** XSD Duration */ 
@@ -46,7 +47,7 @@ public class NodeValueDuration extends N
     protected Node makeNode()
     {
         String lex = duration.toString() ;
-        return Node.createLiteral(lex, null, XSDDatatype.XSDduration) ;
+        return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDduration) ;
     }
     
     @Override

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueFloat.java Sun Mar 17 17:48:00 2013
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.sparql.expr.node
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 import com.hp.hpl.jena.sparql.util.Utils ;
 
@@ -45,7 +46,7 @@ public class NodeValueFloat extends Node
 
     @Override
     protected Node makeNode()
-    { return Node.createLiteral(Utils.stringForm(value), null, XSDDatatype.XSDfloat) ; }
+    { return NodeFactory.createLiteral(Utils.stringForm(value), null, XSDDatatype.XSDfloat) ; }
     
     @Override
     public String asString() { return toString() ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueInteger.java Sun Mar 17 17:48:00 2013
@@ -23,6 +23,7 @@ import java.math.BigInteger ;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 
 
@@ -60,7 +61,7 @@ public class NodeValueInteger extends No
 
     @Override
     protected Node makeNode()
-    { return Node.createLiteral(integer.toString(), null, XSDDatatype.XSDinteger) ; }
+    { return NodeFactory.createLiteral(integer.toString(), null, XSDDatatype.XSDinteger) ; }
     
     @Override
     public String asString() { return toString() ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java Sun Mar 17 17:48:00 2013
@@ -38,7 +38,7 @@ import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.expr.ExprEvalTypeException ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 import com.hp.hpl.jena.sparql.expr.ValueSpaceClassification ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 
 /** The code parts of arithmetic opperations on Nodevlaues.
  */
@@ -126,11 +126,11 @@ public class NodeValueOps
             String lex = d3.toString() ;
             Node n ;
             if ( isDTDur )
-                n = NodeFactory.createLiteralNode(lex, null, dtXSDdayTimeDuration) ;
+                n = NodeFactoryExtra.createLiteralNode(lex, null, dtXSDdayTimeDuration) ;
             else if ( isYMDur )
-                n = NodeFactory.createLiteralNode(lex, null, dtXSDyearMonthDuration) ;
+                n = NodeFactoryExtra.createLiteralNode(lex, null, dtXSDyearMonthDuration) ;
             else
-                n = Node.createLiteral(lex, XSDDatatype.XSDduration) ;
+                n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, XSDDatatype.XSDduration) ;
             return NodeValue.makeNodeDuration(d3, n) ;
         }
         
@@ -186,11 +186,11 @@ public class NodeValueOps
             String lex = d3.toString() ;
             Node n ;
             if ( isDTDur )
-                n = NodeFactory.createLiteralNode(lex, null, dtXSDdayTimeDuration) ;
+                n = NodeFactoryExtra.createLiteralNode(lex, null, dtXSDdayTimeDuration) ;
             else if ( isYMDur )
-                n = NodeFactory.createLiteralNode(lex, null, dtXSDyearMonthDuration) ;
+                n = NodeFactoryExtra.createLiteralNode(lex, null, dtXSDyearMonthDuration) ;
             else
-                n = Node.createLiteral(lex, XSDDatatype.XSDduration) ;
+                n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, XSDDatatype.XSDduration) ;
             return NodeValue.makeNodeDuration(d3, n) ;
         }
         
@@ -252,7 +252,7 @@ public class NodeValueOps
                 throw new ExprEvalTypeException("Operator '*': only dayTime duration.  Got: "+nv1) ;
             BigDecimal dec = nv2.getDecimal() ;
             Duration r = dur.multiply(dec) ;
-            Node n = NodeFactory.createLiteralNode(r.toString(), null, dtXSDdayTimeDuration) ;
+            Node n = NodeFactoryExtra.createLiteralNode(r.toString(), null, dtXSDdayTimeDuration) ;
             return NodeValue.makeNodeDuration(r, n) ; 
         }
         throw new ExprEvalTypeException("Operator '*' : Undefined multiply: "+nv1+" and "+nv2) ; 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueString.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueString.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueString.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.expr.nodevalue;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.expr.NodeValue ;
 import com.hp.hpl.jena.sparql.util.FmtUtils ;
 
@@ -55,7 +56,7 @@ public class NodeValueString extends Nod
     
     @Override
     protected Node makeNode()
-    { return Node.createLiteral(string) ; }
+    { return NodeFactory.createLiteral(string) ; }
     
     @Override
     public void visit(NodeValueVisitor visitor) { visitor.visit(this) ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/XSDFuncOp.java Sun Mar 17 17:48:00 2013
@@ -52,6 +52,7 @@ import com.hp.hpl.jena.datatypes.RDFData
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.datatypes.xsd.XSDDateTime ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
 import com.hp.hpl.jena.sparql.expr.* ;
 import com.hp.hpl.jena.sparql.util.DateTimeStruct ;
@@ -538,7 +539,7 @@ public class XSDFuncOp
     
     private static NodeValue calcReturn(String result, Node arg)
     {
-        Node n2 = Node.createLiteral(result, arg.getLiteralLanguage(), arg.getLiteralDatatype()) ; 
+        Node n2 = NodeFactory.createLiteral(result, arg.getLiteralLanguage(), arg.getLiteralDatatype()) ; 
         return NodeValue.makeNode(n2) ;
         
 //        if ( arg.getLiteralDatatype() != null )
@@ -1090,7 +1091,7 @@ public class XSDFuncOp
     
     public static NodeValue dateTimeCast(NodeValue nv, String typeURI)
     {
-       RDFDatatype t = Node.getType(typeURI) ;
+       RDFDatatype t = NodeFactory.getType(typeURI) ;
        return dateTimeCast(nv, t) ;
     }
 
@@ -1312,17 +1313,17 @@ public class XSDFuncOp
             return null ;
         if ("Z".equals(dts.timezone) )
         {
-            Node n = Node.createLiteral("PT0S", null, Node.getType(XSDDatatype.XSD+"#dayTimeDuration")) ;
+            Node n = NodeFactory.createLiteral("PT0S", null, NodeFactory.getType(XSDDatatype.XSD+"#dayTimeDuration")) ;
             return NodeValue.makeNode(n) ;
         }
         if ("+00:00".equals(dts.timezone) )
         {
-            Node n = Node.createLiteral("PT0S", null, Node.getType(XSDDatatype.XSD+"#dayTimeDuration")) ;
+            Node n = NodeFactory.createLiteral("PT0S", null, NodeFactory.getType(XSDDatatype.XSD+"#dayTimeDuration")) ;
             return NodeValue.makeNode(n) ;
         }
         if ("-00:00".equals(dts.timezone) )
         {
-            Node n = Node.createLiteral("-PT0S", null, Node.getType(XSDDatatype.XSD+"#dayTimeDuration")) ;
+            Node n = NodeFactory.createLiteral("-PT0S", null, NodeFactory.getType(XSDDatatype.XSD+"#dayTimeDuration")) ;
             return NodeValue.makeNode(n) ;
         }
         

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphMemPlain.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import java.util.Locale ;
 import java.util.Set ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.graph.TripleMatch ;
 import com.hp.hpl.jena.graph.impl.GraphBase ;
@@ -101,7 +102,7 @@ public class GraphMemPlain extends Graph
         {
             String lang = node.getLiteralLanguage() ;
             if ( lang != null && ! lang.equals("") )
-                node = Node.createLiteral(node.getLiteralLexicalForm(),
+                node = NodeFactory.createLiteral(node.getLiteralLexicalForm(),
                                           lang.toLowerCase(Locale.ENGLISH),
                                           node.getLiteralDatatype()) ;
         }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/GraphSPARQL.java Sun Mar 17 17:48:00 2013
@@ -61,7 +61,7 @@ public class GraphSPARQL extends GraphBa
     
     public GraphSPARQL(DatasetGraph dataset, String uri)
     {
-        this(dataset, Node.createURI(uri)) ;
+        this(dataset, NodeFactory.createURI(uri)) ;
     }
 
     public GraphSPARQL(DatasetGraph dsg, Node gn)

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/graph/NodeConst.java Sun Mar 17 17:48:00 2013
@@ -20,18 +20,19 @@ package com.hp.hpl.jena.sparql.graph;
 
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.vocabulary.OWL ;
 import com.hp.hpl.jena.vocabulary.RDF ;
 
 public class NodeConst
 {
-    public static final Node nodeTrue       = Node.createLiteral("true", null,  XSDDatatype.XSDboolean) ; 
-    public static final Node nodeFalse      = Node.createLiteral("false", null,  XSDDatatype.XSDboolean) ; 
-    public static final Node nodeZero       = Node.createLiteral("0", null,  XSDDatatype.XSDinteger) ;
-    public static final Node nodeOne        = Node.createLiteral("1", null,  XSDDatatype.XSDinteger) ;
-    public static final Node nodeTwo        = Node.createLiteral("2", null,  XSDDatatype.XSDinteger) ;
-    public static final Node nodeMinusOne   = Node.createLiteral("-1", null,  XSDDatatype.XSDinteger) ;
-    public static final Node emptyString    = Node.createLiteral("") ;
+    public static final Node nodeTrue       = NodeFactory.createLiteral("true", null,  XSDDatatype.XSDboolean) ; 
+    public static final Node nodeFalse      = NodeFactory.createLiteral("false", null,  XSDDatatype.XSDboolean) ; 
+    public static final Node nodeZero       = NodeFactory.createLiteral("0", null,  XSDDatatype.XSDinteger) ;
+    public static final Node nodeOne        = NodeFactory.createLiteral("1", null,  XSDDatatype.XSDinteger) ;
+    public static final Node nodeTwo        = NodeFactory.createLiteral("2", null,  XSDDatatype.XSDinteger) ;
+    public static final Node nodeMinusOne   = NodeFactory.createLiteral("-1", null,  XSDDatatype.XSDinteger) ;
+    public static final Node emptyString    = NodeFactory.createLiteral("") ;
     
     public static final Node nodeRDFType    = RDF.Nodes.type ;
     public static final Node nodeFirst      = RDF.Nodes.first ;
@@ -40,6 +41,6 @@ public class NodeConst
     public static final Node nodeANY        = Node.ANY ;
     
     public static final Node nodeOwlSameAs  = OWL.sameAs.asNode() ;
-    public static final Node dtRDFlangString = Node.createURI(RDF.getURI()+"langString") ;
+    public static final Node dtRDFlangString = NodeFactory.createURI(RDF.getURI()+"langString") ;
 
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java Sun Mar 17 17:48:00 2013
@@ -29,6 +29,7 @@ import com.hp.hpl.jena.datatypes.RDFData
 import com.hp.hpl.jena.datatypes.TypeMapper ;
 import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.n3.JenaURIException ;
 import com.hp.hpl.jena.query.ARQ ;
@@ -129,17 +130,17 @@ public class ParserBase
     
     protected Node createLiteralInteger(String lexicalForm)
     {
-        return Node.createLiteral(lexicalForm, null, XSDDatatype.XSDinteger) ;
+        return NodeFactory.createLiteral(lexicalForm, null, XSDDatatype.XSDinteger) ;
     }
     
     protected Node createLiteralDouble(String lexicalForm)
     {
-        return Node.createLiteral(lexicalForm, null, XSDDatatype.XSDdouble) ;
+        return NodeFactory.createLiteral(lexicalForm, null, XSDDatatype.XSDdouble) ;
     }
     
     protected Node createLiteralDecimal(String lexicalForm)
     {
-        return Node.createLiteral(lexicalForm, null, XSDDatatype.XSDdecimal) ;
+        return NodeFactory.createLiteral(lexicalForm, null, XSDDatatype.XSDdecimal) ;
     }
 
     protected Node stripSign(Node node)
@@ -153,7 +154,7 @@ public class ParserBase
             throw new ARQInternalErrorException("Literal does not start with a sign: "+lex) ;
         
         lex = lex.substring(1) ;
-        return Node.createLiteral(lex, lang, dt) ;
+        return NodeFactory.createLiteral(lex, lang, dt) ;
     }
     
     protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI)
@@ -163,10 +164,10 @@ public class ParserBase
         if ( datatypeURI != null)
         {
             RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI) ;
-            n = Node.createLiteral(lexicalForm, null, dType) ;
+            n = NodeFactory.createLiteral(lexicalForm, null, dType) ;
         }
         else
-            n = Node.createLiteral(lexicalForm, langTag, null) ;
+            n = NodeFactory.createLiteral(lexicalForm, langTag, null) ;
         return n ;
     }
     
@@ -280,7 +281,7 @@ public class ParserBase
         if ( skolomizedBNodes )
             return RiotLib.createIRIorBNode(iri) ;
         else
-            return Node.createURI(iri) ;
+            return NodeFactory.createURI(iri) ;
     }
     
     protected boolean isBNodeIRI(String iri)

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.mgt;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.n3.IRIResolver ;
 
 
@@ -40,7 +41,7 @@ public class SystemInfo implements Syste
     private static Node createIRI(String iriStr)
     {
         try {
-            return Node.createURI(IRIResolver.resolveGlobal(iriStr)) ;
+            return NodeFactory.createURI(IRIResolver.resolveGlobal(iriStr)) ;
         } catch (RuntimeException ex) { return null ; }
     }
         
@@ -64,6 +65,6 @@ public class SystemInfo implements Syste
     
     public Node getIRI()
     { 
-        return Node.createURI(name) ;
+        return NodeFactory.createURI(name) ;
     }
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/TemplateLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/TemplateLib.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/TemplateLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/TemplateLib.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import org.apache.jena.atlas.iterator.It
 import org.apache.jena.atlas.iterator.Transform ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 import com.hp.hpl.jena.sparql.core.Substitute ;
@@ -191,7 +192,7 @@ public class TemplateLib
     private static Node newBlank(Node n, Map<Node, Node> bNodeMap)
     {
         if ( ! bNodeMap.containsKey(n) ) 
-            bNodeMap.put(n, Node.createAnon() );
+            bNodeMap.put(n, NodeFactory.createAnon() );
         return bNodeMap.get(n) ;
     }
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java Sun Mar 17 17:48:00 2013
@@ -22,7 +22,7 @@ import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.sparql.ARQConstants ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 import com.hp.hpl.jena.update.GraphStore ;
 
 public abstract class UpdateEngineBase implements UpdateEngine
@@ -47,7 +47,7 @@ public abstract class UpdateEngineBase i
         if ( dataset.getContext() != null )
             context.putAll(dataset.getContext()) ;
         
-        context.set(ARQConstants.sysCurrentTime, NodeFactory.nowAsDateTime()) ;
+        context.set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
         return context ; 
     }
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/Target.java Sun Mar 17 17:48:00 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.modify.re
 import static com.hp.hpl.jena.sparql.modify.request.Target.Decl.* ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.util.FmtUtils ;
 
 public class Target
@@ -32,7 +33,7 @@ public class Target
     public static final Target ALL = new Target(ALL$) ;
 
     public static Target create(String iri)
-    { return new Target(Node.createURI(iri)) ; }
+    { return new Target(NodeFactory.createURI(iri)) ; }
 
     public static Target create(Node graphName)
     { return new Target(graphName) ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateCreate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateCreate.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateCreate.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateCreate.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.modify.request;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.update.Update ;
 
 
@@ -29,12 +30,12 @@ public class UpdateCreate extends Update
     
     public UpdateCreate(String s)
     {
-        this(Node.createURI(s), false) ;
+        this(NodeFactory.createURI(s), false) ;
     }
     
     public UpdateCreate(String s, boolean silent)
     {
-        this(Node.createURI(s), silent) ;
+        this(NodeFactory.createURI(s), silent) ;
     }
     
     public UpdateCreate(Node iri)

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateLoad.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateLoad.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateLoad.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateLoad.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.modify.request;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.update.Update ;
 
 public class UpdateLoad extends Update
@@ -30,12 +31,12 @@ public class UpdateLoad extends Update
 
     public UpdateLoad(String source, String dest)
     {
-        this(source, Node.createURI(dest), false) ;
+        this(source, NodeFactory.createURI(dest), false) ;
     }
     
     public UpdateLoad(String source, String dest, boolean silent)
     {
-        this(source, Node.createURI(dest), silent) ;
+        this(source, NodeFactory.createURI(dest), silent) ;
     }
 
     public UpdateLoad(String source, Node dest)

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/blankNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/blankNode.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/blankNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/blankNode.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.pfunction.library;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
 import com.hp.hpl.jena.sparql.engine.QueryIterator ;
@@ -39,7 +40,7 @@ public class blankNode extends PFuncSimp
         if ( ! subject.isBlank() )
             return IterLib.noResults(execCxt) ;
         String str = subject.getBlankNodeLabel() ;
-        Node obj = Node.createLiteral(str) ;
+        Node obj = NodeFactory.createLiteral(str) ;
         if ( Var.isVar(object) )
             return IterLib.oneResult(binding, Var.alloc(object), obj, execCxt) ;
         

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/concat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/concat.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/concat.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/concat.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.pfunction.library;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
 import com.hp.hpl.jena.sparql.engine.QueryIterator ;
@@ -47,7 +48,7 @@ public class concat extends PFuncSimpleA
             x = x+str ;
         }
          
-        return IterLib.oneResult(binding, Var.alloc(subject), Node.createLiteral(x), execCxt) ;
+        return IterLib.oneResult(binding, Var.alloc(subject), NodeFactory.createLiteral(x), execCxt) ;
     }
 
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listIndex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listIndex.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listIndex.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listIndex.java Sun Mar 17 17:48:00 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.sparql.engine.ite
 import com.hp.hpl.jena.sparql.expr.ExprEvalException ;
 import com.hp.hpl.jena.sparql.pfunction.PropFuncArg ;
 import com.hp.hpl.jena.sparql.util.IterLib ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 import com.hp.hpl.jena.sparql.util.graph.GNode ;
 import com.hp.hpl.jena.sparql.util.graph.GraphList ;
 
@@ -97,7 +97,7 @@ public class listIndex extends ListBaseL
                                             Node listNode, Node indexNode, Var varMember,
                                             ExecutionContext execCxt)
     {
-        int i = NodeFactory.nodeToInt(indexNode) ;
+        int i = NodeFactoryExtra.nodeToInt(indexNode) ;
         if ( i < 0 )
             return IterLib.noResults(execCxt) ;
 
@@ -111,7 +111,7 @@ public class listIndex extends ListBaseL
                                                Node listNode, Node indexNode, Node memberNode,
                                                ExecutionContext execCxt)
     {
-        int i = NodeFactory.nodeToInt(indexNode) ;
+        int i = NodeFactoryExtra.nodeToInt(indexNode) ;
         if ( i < 0 )
             return IterLib.noResults(execCxt) ;
         Node n = GraphList.get(new GNode(graph, listNode), i) ;
@@ -131,7 +131,7 @@ public class listIndex extends ListBaseL
         int i = GraphList.index(new GNode(graph, listNode), member) ;
         if ( i < 0 )
             return IterLib.noResults(execCxt) ;
-        Node idx = NodeFactory.intToNode(i) ;
+        Node idx = NodeFactoryExtra.intToNode(i) ;
         return IterLib.oneResult(binding, var, idx, execCxt) ; 
     }
 
@@ -144,7 +144,7 @@ public class listIndex extends ListBaseL
         List<Binding> bindings = new ArrayList<Binding>() ;
         for ( int i = 0 ; i < members.size() ; i++ )
         {
-            Node idx = NodeFactory.intToNode(i) ;
+            Node idx = NodeFactoryExtra.intToNode(i) ;
             Node member = members.get(i) ;
             BindingMap b = BindingFactory.create(binding) ;
             b.add(varIndex, idx) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listLength.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listLength.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listLength.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/listLength.java Sun Mar 17 17:48:00 2013
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.sparql.engine.Exe
 import com.hp.hpl.jena.sparql.engine.QueryIterator ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
 import com.hp.hpl.jena.sparql.util.IterLib ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 import com.hp.hpl.jena.sparql.util.graph.GNode ;
 import com.hp.hpl.jena.sparql.util.graph.GraphList ;
 
@@ -56,14 +56,14 @@ public class listLength extends ListBase
         int x = GraphList.length(new GNode(graph, listNode)) ;
         if ( x < 0 )
             return IterLib.noResults(execCxt) ;
-        Node n = NodeFactory.intToNode(x) ;
+        Node n = NodeFactoryExtra.intToNode(x) ;
         return IterLib.oneResult(binding, varLength, n, execCxt) ;
     }
     
     private QueryIterator verify(Binding binding, Graph graph, Node listNode, Node length, ExecutionContext execCxt)
     {
         int x = GraphList.length(new GNode(graph, listNode)) ;
-        int len = NodeFactory.nodeToInt(length) ;
+        int len = NodeFactoryExtra.nodeToInt(length) ;
         
         if ( x == len )
             return IterLib.result(binding, execCxt) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/splitIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/splitIRI.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/splitIRI.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/splitIRI.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.pfunction.library;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.query.QueryBuildException ;
 import com.hp.hpl.jena.query.QueryException ;
 import com.hp.hpl.jena.sparql.core.Var ;
@@ -101,11 +102,11 @@ public class splitIRI extends PropertyFu
         
         if ( Var.isVar(namespaceNode) ) // .isVariable() )
         {
-            b.add(Var.alloc(namespaceNode), Node.createURI(namespace)) ;
+            b.add(Var.alloc(namespaceNode), NodeFactory.createURI(namespace)) ;
             // Check for the case of (?x ?x) (very unlikely - and even more unlikely to cause a match)
             // but it's possible for strange URI schemes.
             if ( localnameNode.isVariable() && namespaceNode.getName() == localnameNode.getName() )
-                localnameNode = Node.createURI(namespace) ;
+                localnameNode = NodeFactory.createURI(namespace) ;
         }
         else
         {
@@ -121,7 +122,7 @@ public class splitIRI extends PropertyFu
         }
         
         if ( Var.isVar(localnameNode) )
-            b.add(Var.alloc(localnameNode), Node.createLiteral(localname)) ;
+            b.add(Var.alloc(localnameNode), NodeFactory.createLiteral(localname)) ;
         else
         {
             // Only string literals (plain strings or datatype xsd:string) 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/str.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/str.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/str.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/str.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.pfunction.library;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.query.QueryExecException ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
@@ -61,7 +62,7 @@ public class str extends PFuncSimple
         if ( object.isBlank() )
             throw new QueryExecException("str: object is a blank node") ;
         
-        Node strValue =  Node.createLiteral(NodeFunctions.str(object)) ;
+        Node strValue =  NodeFactory.createLiteral(NodeFunctions.str(object)) ;
         
         if ( Var.isVar(subject) )
             return IterLib.oneResult(binding, Var.alloc(subject), strValue, execCxt) ;

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/version.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/version.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/version.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/version.java Sun Mar 17 17:48:00 2013
@@ -23,6 +23,7 @@ import java.util.Iterator ;
 import java.util.List ;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.sparql.SystemARQ ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
@@ -57,7 +58,7 @@ public class version extends PropertyFun
             SystemInfo info = iter.next();
             if ( ! isSameOrVar(subj, info.getIRI()) )
                 continue ;
-            Node version = Node.createLiteral(info.getVersion()) ;
+            Node version = NodeFactory.createLiteral(info.getVersion()) ;
             if ( ! isSameOrVar(obj, version) ) 
                 continue ;
             

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/versionARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/versionARQ.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/versionARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/pfunction/library/versionARQ.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.sparql.pfunction.library;
 
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
@@ -38,7 +39,7 @@ public class versionARQ extends Property
     
     static Node version = NodeValue.makeString(versionStr).asNode() ;
     
-    static Node arq = Node.createURI(ARQ.arqIRI) ;
+    static Node arq = NodeFactory.createURI(ARQ.arqIRI) ;
     
     public versionARQ()
     { super(PropFuncArgType.PF_ARG_SINGLE, PropFuncArgType.PF_ARG_SINGLE) ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVInputIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVInputIterator.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVInputIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/CSVInputIterator.java Sun Mar 17 17:48:00 2013
@@ -27,7 +27,7 @@ import java.util.NoSuchElementException 
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.io.IndentedWriter ;
 
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.query.QueryException ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.binding.Binding ;
@@ -176,7 +176,7 @@ public class CSVInputIterator extends Qu
         if ( terms.size() != vars.size() )
             throw new QueryException(String.format("Error Parsing CSV results at Line %d - The result row '%s' has %d items when %d was expected", this.lineNum, line, terms.size(), vars.size())) ;
         for ( int i = 0 ; i < vars.size() ; i++ )
-            binding.add(vars.get(i), Node.createLiteral(terms.get(i))) ;
+            binding.add(vars.get(i), NodeFactory.createLiteral(terms.get(i))) ;
         return binding ;
     }
 

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONInput.java Sun Mar 17 17:48:00 2013
@@ -46,6 +46,7 @@ import org.apache.jena.riot.lang.LabelTo
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.TypeMapper ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.sparql.core.Var ;
@@ -228,7 +229,7 @@ public class JSONInput extends SPARQLRes
         {
             checkContains(term, kType, kValue) ;
             String uri = v ;
-            Node n = Node.createURI(v) ;
+            Node n = NodeFactory.createURI(v) ;
             return n ;
         }
         
@@ -239,7 +240,7 @@ public class JSONInput extends SPARQLRes
             if ( lang != null && dtStr != null )
                 throw new ResultSetException("Both language and datatype defined: "+term) ;
             RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtStr) ;
-            return Node.createLiteral(v, lang, dt)  ;
+            return NodeFactory.createLiteral(v, lang, dt)  ;
         }
         
         if ( kBnode.equals(type) )

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInput.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInput.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInput.java Sun Mar 17 17:48:00 2013
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.sparql.ARQException ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ResultSetStream ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 
 /**
  * Input reader associated to {@link TSVOutput}.
@@ -66,7 +66,7 @@ public class TSVInput {
         	    {
         	        Node v ;
         	        try {
-        	            v = NodeFactory.parseNode(token) ;
+        	            v = NodeFactoryExtra.parseNode(token) ;
         	            if ( v == null || ! v.isVariable())
         	                throw new ResultSetException("TSV Results malformed, not a variable: "+token);
         	        } catch (RiotException ex)

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInputIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInputIterator.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInputIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TSVInputIterator.java Sun Mar 17 17:48:00 2013
@@ -36,7 +36,7 @@ import com.hp.hpl.jena.sparql.engine.bin
 import com.hp.hpl.jena.sparql.engine.binding.BindingMap ;
 import com.hp.hpl.jena.sparql.engine.iterator.QueryIteratorBase ;
 import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 
 /**
  * Class used to do streaming parsing of actual result rows from the TSV
@@ -121,7 +121,7 @@ public class TSVInputIterator extends Qu
 
             //Bound value so parse it and add to the binding
             try {
-                Node node = NodeFactory.parseNode(token) ;
+                Node node = NodeFactoryExtra.parseNode(token) ;
                 if ( !node.isConcrete() )
                     throw new ResultSetException(format("Line %d: Not a concrete RDF term: %s",lineNum, token)) ;
                 this.binding.add(this.vars.get(i), node);

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputSAX.java Sun Mar 17 17:48:00 2013
@@ -35,6 +35,7 @@ import org.xml.sax.helpers.XMLReaderFact
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.TypeMapper ;
 import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.ResultSetStream ;
@@ -321,7 +322,7 @@ class XMLInputSAX extends SPARQLResult
         {
             endAccumulate() ;
             String uri = buff.toString() ;
-            Node n = Node.createURI(uri) ;
+            Node n = NodeFactory.createURI(uri) ;
             if ( checkVarName("URI: "+uri) )
                 addBinding(binding, Var.alloc(varName), n) ;
         }
@@ -346,7 +347,7 @@ class XMLInputSAX extends SPARQLResult
             if ( datatype != null )
                 dType = TypeMapper.getInstance().getSafeTypeByName(datatype);
             
-            Node n = Node.createLiteral(lexicalForm.toString(),  langTag, dType) ;
+            Node n = NodeFactory.createLiteral(lexicalForm.toString(),  langTag, dType) ;
             if ( checkVarName("Literal: "+FmtUtils.stringForNode(n)) )
                 addBinding(binding, Var.alloc(varName), n) ;
             



Mime
View raw message