jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1457497 [1/2] - in /jena/trunk/jena-core/src: main/java/com/hp/hpl/jena/graph/ main/java/com/hp/hpl/jena/n3/turtle/ main/java/com/hp/hpl/jena/ontology/impl/ main/java/com/hp/hpl/jena/rdf/arp/ main/java/com/hp/hpl/jena/rdf/model/ main/java/...
Date Sun, 17 Mar 2013 17:41:54 GMT
Author: andy
Date: Sun Mar 17 17:41:52 2013
New Revision: 1457497

URL: http://svn.apache.org/r1457497
Log:
JENA-398 : Extract NodeFactory

Create NodeFactory and move all the creation statics from Node into it.
Leave deprecated delgates.

Added:
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
Modified:
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Node.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/LabelToNodeMap.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/ParserBase.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntModelImpl.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/ReasonerRegistry.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Functor.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeSkolem.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeTemp.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Regex.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/UriConcat.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RuleClauseCode.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TempNodeCache.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifier.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRules.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRDFS9.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestTransitiveGraphCache.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Node.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Node.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Node.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Node.java Sun Mar 17 17:41:52 2013
@@ -20,9 +20,7 @@ package com.hp.hpl.jena.graph;
 
 import com.hp.hpl.jena.datatypes.DatatypeFormatException;
 import com.hp.hpl.jena.datatypes.RDFDatatype;
-import com.hp.hpl.jena.datatypes.TypeMapper;
 import com.hp.hpl.jena.graph.impl.LiteralLabel;
-import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
 import com.hp.hpl.jena.rdf.model.AnonId;
 import com.hp.hpl.jena.shared.JenaException;
 import com.hp.hpl.jena.shared.PrefixMapping;
@@ -47,42 +45,74 @@ public abstract class Node {
        
     static final String RDFprefix = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
             
+    /**
+     * @deprecated Use {@link NodeFactory#getType(String)} instead
+     */
+    @Deprecated
     public static RDFDatatype getType( String s )
-        { return TypeMapper.getInstance().getSafeTypeByName( s ); }
+        {
+            return NodeFactory.getType(s) ;
+        }
     
-    /** make a blank node with a fresh anon id */ 
+    /** make a blank node with a fresh anon id 
+     * @deprecated Use {@link NodeFactory#createAnon()} instead*/ 
+    @Deprecated
     public static Node createAnon()
-        { return createAnon( AnonId.create() ); }
+        {
+            return NodeFactory.createAnon() ;
+        }
     
-    /** make a blank node with the specified label */
+    /** make a blank node with the specified label 
+     * @deprecated Use {@link NodeFactory#createAnon(AnonId)} instead*/
+    @Deprecated
     public static Node createAnon( AnonId id )
-        { return create( makeAnon, id ); }
+        {
+            return NodeFactory.createAnon(id) ;
+        }
         
-    /** make a literal node with the specified literal value */
+    /** make a literal node with the specified literal value 
+     * @deprecated Use {@link NodeFactory#createLiteral(LiteralLabel)} instead*/
+    @Deprecated
     public static Node createLiteral( LiteralLabel lit )
-        { return create( makeLiteral, lit ); }
+        {
+            return NodeFactory.createLiteral(lit) ;
+        }
         
-    /** make a URI node with the specified URIref string */
+    /** make a URI node with the specified URIref string 
+     * @deprecated Use {@link NodeFactory#createURI(String)} instead*/
+    @Deprecated
     public static Node createURI( String uri )
-        { return create( makeURI, uri ); }
+        {
+            return NodeFactory.createURI(uri) ;
+        }
     
-    /** make a variable node with a given name */
+    /** make a variable node with a given name 
+     * @deprecated Use {@link NodeFactory#createVariable(String)} instead*/
+    @Deprecated
     public static Node createVariable( String name )
-        { return create( makeVariable, Node_Variable.variable( name ) ); }
+        {
+            return NodeFactory.createVariable(name) ;
+        }
         
+    /**
+     * @deprecated Use {@link NodeFactory#createLiteral(String)} instead
+     */
+    @Deprecated
     public static Node createLiteral( String value )
-        { return createLiteral( value, "", false ); }
+        {
+            return NodeFactory.createLiteral(value) ;
+        }
     
     /** make a literal with specified language and XMLishness.
         _lit_ must *not* be null.
         @param isXml If true then lit is exclusive canonical XML of type 
             rdf:XMLLiteral, and no checking will be invoked.
+     * @deprecated Use {@link NodeFactory#createLiteral(String,String,boolean)} instead
     */
+    @Deprecated
     public static Node createLiteral( String lit, String lang, boolean isXml )
         {
-        if (lit == null) throw new NullPointerException
-            ( "null for literals has been illegal since Jena 2.0" );
-        return createLiteral( LiteralLabelFactory.create( lit, lang, isXml ) ); 
+            return NodeFactory.createLiteral(lit, lang, isXml) ;
         }    
         
     /**
@@ -94,10 +124,14 @@ public abstract class Node {
      * @param lang the optional language tag
      * @param dtype the type of the literal, null for old style "plain" literals
      * @throws DatatypeFormatException if lex is not a legal form of dtype
+     * @deprecated Use {@link NodeFactory#createLiteral(String,String,RDFDatatype)} instead
      */
+    @Deprecated
     public static Node createLiteral( String lex, String lang, RDFDatatype dtype ) 
         throws DatatypeFormatException 
-        { return createLiteral( LiteralLabelFactory.createLiteralLabel( lex, lang, dtype ) ); }
+        {
+            return NodeFactory.createLiteral(lex, lang, dtype) ;
+        }
     
     /**
      * Build a typed literal node from its lexical form. The
@@ -107,18 +141,34 @@ public abstract class Node {
      * @param lex the lexical form of the literal
      * @param dtype the type of the literal, null for old style "plain" literals
      * @throws DatatypeFormatException if lex is not a legal form of dtype
+     * @deprecated Use {@link NodeFactory#createLiteral(String,RDFDatatype)} instead
      */
+    @Deprecated
     public static Node createLiteral( String lex, RDFDatatype dtype ) 
         throws DatatypeFormatException 
-        { return createLiteral( LiteralLabelFactory.createLiteralLabel( lex, "", dtype ) ); }
+        {
+            return NodeFactory.createLiteral(lex, dtype) ;
+        }
     
+    /**
+     * @deprecated Use {@link NodeFactory#createUncachedLiteral(Object,String,RDFDatatype)} instead
+     */
+    @Deprecated
     public static Node createUncachedLiteral( Object value, String lang, RDFDatatype dtype ) 
         throws DatatypeFormatException 
-        { return new Node_Literal( LiteralLabelFactory.create( value, lang, dtype ) ); }
+        {
+            return NodeFactory.createUncachedLiteral(value, lang, dtype) ;
+        }
     
+    /**
+     * @deprecated Use {@link NodeFactory#createUncachedLiteral(Object,RDFDatatype)} instead
+     */
+    @Deprecated
     public static Node createUncachedLiteral( Object value, RDFDatatype dtype ) 
         throws DatatypeFormatException 
-        { return new Node_Literal( LiteralLabelFactory.create( value, "", dtype ) ); }
+        {
+            return NodeFactory.createUncachedLiteral(value, dtype) ;
+        }
                                                    
     /**
         Visit a Node and dispatch on it to the appropriate method from the 

Added: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java?rev=1457497&view=auto
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java (added)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java Sun Mar 17 17:41:52 2013
@@ -0,0 +1,105 @@
+/**
+ * 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.graph;
+
+import com.hp.hpl.jena.datatypes.DatatypeFormatException ;
+import com.hp.hpl.jena.datatypes.RDFDatatype ;
+import com.hp.hpl.jena.datatypes.TypeMapper ;
+import com.hp.hpl.jena.graph.impl.LiteralLabel ;
+import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
+import com.hp.hpl.jena.rdf.model.AnonId ;
+
+public class NodeFactory
+{
+
+    public static RDFDatatype getType( String s )
+    { return TypeMapper.getInstance().getSafeTypeByName( s ); }
+
+    /** make a blank node with a fresh anon id */ 
+    public static Node createAnon()
+        { return createAnon( AnonId.create() ); }
+
+    /** make a blank node with the specified label */
+    public static Node createAnon( AnonId id )
+        { return Node.create( Node.makeAnon, id ); }
+
+    /** make a literal node with the specified literal value */
+    public static Node createLiteral( LiteralLabel lit )
+        { return Node.create( Node.makeLiteral, lit ); }
+
+    /** make a URI node with the specified URIref string */
+    public static Node createURI( String uri )
+        { return Node.create( Node.makeURI, uri ); }
+
+    /** make a variable node with a given name */
+    public static Node createVariable( String name )
+        { return Node.create( Node.makeVariable, Node_Variable.variable( name ) ); }
+
+    public static Node createLiteral( String value )
+    { return createLiteral( value, "", false ); }
+
+    /** make a literal with specified language and XMLishness.
+        _lit_ must *not* be null.
+        @param isXml If true then lit is exclusive canonical XML of type 
+            rdf:XMLLiteral, and no checking will be invoked.
+    */
+    public static Node createLiteral( String lit, String lang, boolean isXml )
+        {
+        if (lit == null) throw new NullPointerException
+            ( "null for literals has been illegal since Jena 2.0" );
+        return createLiteral( LiteralLabelFactory.create( lit, lang, isXml ) ); 
+        }
+
+    /**
+     * Build a literal node from its lexical form. The
+     * lexical form will be parsed now and the value stored. If
+     * the form is not legal this will throw an exception.
+     * 
+     * @param lex the lexical form of the literal
+     * @param lang the optional language tag
+     * @param dtype the type of the literal, null for old style "plain" literals
+     * @throws DatatypeFormatException if lex is not a legal form of dtype
+     */
+    public static Node createLiteral( String lex, String lang, RDFDatatype dtype ) 
+        throws DatatypeFormatException 
+        { return createLiteral( LiteralLabelFactory.createLiteralLabel( lex, lang, dtype ) ); }
+
+    /**
+     * Build a typed literal node from its lexical form. The
+     * lexical form will be parsed now and the value stored. If
+     * the form is not legal this will throw an exception.
+     * 
+     * @param lex the lexical form of the literal
+     * @param dtype the type of the literal, null for old style "plain" literals
+     * @throws DatatypeFormatException if lex is not a legal form of dtype
+     */
+    public static Node createLiteral( String lex, RDFDatatype dtype ) 
+        throws DatatypeFormatException 
+        { return createLiteral( LiteralLabelFactory.createLiteralLabel( lex, "", dtype ) ); }
+
+    public static Node createUncachedLiteral( Object value, String lang, RDFDatatype dtype ) 
+    throws DatatypeFormatException 
+    { return new Node_Literal( LiteralLabelFactory.create( value, lang, dtype ) ); }
+
+    public static Node createUncachedLiteral( Object value, RDFDatatype dtype ) 
+    throws DatatypeFormatException 
+    { return new Node_Literal( LiteralLabelFactory.create( value, "", dtype ) ); }
+
+}
+

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/LabelToNodeMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/LabelToNodeMap.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/LabelToNodeMap.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/LabelToNodeMap.java Sun Mar 17 17:41:52 2013
@@ -22,6 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 
 /** Map from _:* form to bNodes
  */
@@ -45,7 +46,7 @@ public class LabelToNodeMap
     
     public Node allocNode()
     {
-        return Node.createAnon() ;
+        return NodeFactory.createAnon() ;
     }
     
     public void clear()

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/ParserBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/ParserBase.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/ParserBase.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/ParserBase.java Sun Mar 17 17:41:52 2013
@@ -22,6 +22,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.IRIResolver;
 import com.hp.hpl.jena.n3.JenaURIException;
@@ -34,8 +35,8 @@ import com.hp.hpl.jena.vocabulary.RDF;
 public class ParserBase
 {
     // Should be the same as ARQ ParserBase and Prologues.
-    protected final Node XSD_TRUE   = Node.createLiteral("true", null, XSDDatatype.XSDboolean) ;
-    protected final Node XSD_FALSE  = Node.createLiteral("false", null, XSDDatatype.XSDboolean) ;
+    protected final Node XSD_TRUE   = NodeFactory.createLiteral("true", null, XSDDatatype.XSDboolean) ;
+    protected final Node XSD_FALSE  = NodeFactory.createLiteral("false", null, XSDDatatype.XSDboolean) ;
     
     protected final Node nRDFtype       = RDF.type.asNode() ;
     
@@ -49,7 +50,7 @@ public class ParserBase
 
     protected final String SWAP_NS      = "http://www.w3.org/2000/10/swap/" ;
     protected final String SWAP_LOG_NS  = "http://www.w3.org/2000/10/swap/log#" ;
-    protected final Node nLogImplies    = Node.createURI(SWAP_LOG_NS+"implies") ;
+    protected final Node nLogImplies    = NodeFactory.createURI(SWAP_LOG_NS+"implies") ;
     
     protected final Node nOwlSameAs     = OWL.sameAs.asNode() ;
     
@@ -108,17 +109,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 createLiteral(String lexicalForm, String langTag, Node datatype)
@@ -134,10 +135,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 ;
     }
     
@@ -245,7 +246,7 @@ public class ParserBase
     protected Node createVariable(String s, int line, int column)
     {
         s = s.substring(1) ; // Drop the marker
-        return Node.createVariable(s) ;
+        return NodeFactory.createVariable(s) ;
     }
     
     protected Node createNode(String iri)
@@ -254,10 +255,10 @@ public class ParserBase
         if ( isBNodeIRI(iri) )
         {
             String s = iri.substring(bNodeLabelStart.length()) ;
-            Node n = Node.createAnon(new AnonId(s)) ;
+            Node n = NodeFactory.createAnon(new AnonId(s)) ;
             return n ;
         }
-        return Node.createURI(iri) ;
+        return NodeFactory.createURI(iri) ;
     }
     
     protected boolean isBNodeIRI(String iri)

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntModelImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntModelImpl.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntModelImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/ontology/impl/OntModelImpl.java Sun Mar 17 17:41:52 2013
@@ -36,6 +36,7 @@ import com.hp.hpl.jena.enhanced.BuiltinP
 import com.hp.hpl.jena.enhanced.EnhNode ;
 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.graph.compose.MultiUnion ;
 import com.hp.hpl.jena.ontology.* ;
@@ -2854,7 +2855,7 @@ public class OntModelImpl extends ModelC
             throw new IllegalArgumentException( "Cannot get() ontology value with a null URI" );
         }
 
-        Node n = Node.createURI( uri );
+        Node n = NodeFactory.createURI( uri );
 
         if (getGraph().contains( n, Node.ANY, Node.ANY )) {
             // this resource is a subject in the graph

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/arp/JenaReader.java Sun Mar 17 17:41:52 2013
@@ -34,10 +34,7 @@ import org.xml.sax.SAXNotSupportedExcept
 
 import com.hp.hpl.jena.datatypes.RDFDatatype;
 import com.hp.hpl.jena.datatypes.TypeMapper;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.GraphEvents;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.graph.* ;
 import org.apache.jena.iri.IRIFactory;
 
 import com.hp.hpl.jena.rdf.arp.impl.RDFXMLParser;
@@ -108,25 +105,25 @@ public class JenaReader implements RDFRe
     private static Node convert(ALiteral lit) {
         String dtURI = lit.getDatatypeURI();
         if (dtURI == null)
-            return Node.createLiteral(lit.toString(), lit.getLang(), false);
+            return NodeFactory.createLiteral(lit.toString(), lit.getLang(), false);
 
         if (lit.isWellFormedXML()) {
-            return Node.createLiteral(lit.toString(), null, true);
+            return NodeFactory.createLiteral(lit.toString(), null, true);
         }
 
         RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
-        return Node.createLiteral(lit.toString(), null, dt);
+        return NodeFactory.createLiteral(lit.toString(), null, dt);
 
     }
 
     private static Node convert(AResource r) {
         if (!r.isAnonymous())
-            return Node.createURI(r.getURI());
+            return NodeFactory.createURI(r.getURI());
 
         // String id = r.getAnonymousID();
         Node rr = (Node) r.getUserData();
         if (rr == null) {
-            rr = Node.createAnon();
+            rr = NodeFactory.createAnon();
             r.setUserData(rr);
         }
         return rr;

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java Sun Mar 17 17:41:52 2013
@@ -23,7 +23,7 @@ import java.util.Calendar;
 import com.hp.hpl.jena.datatypes.RDFDatatype;
 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.graph.impl.LiteralLabel;
 import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
 import com.hp.hpl.jena.rdf.model.impl.*;
@@ -265,18 +265,18 @@ public class ResourceFactory {
         
         @Override
         public Literal createPlainLiteral( String string ) {
-            return new LiteralImpl(  Node.createLiteral( string, "", false ), null );
+            return new LiteralImpl(  NodeFactory.createLiteral( string, "", false ), null );
         }
 
         @Override
         public Literal createLangLiteral( String string , String lang ) {
-            return new LiteralImpl(  Node.createLiteral( string, lang, false ), null );
+            return new LiteralImpl(  NodeFactory.createLiteral( string, lang, false ), null );
         }
         
         @Override
         public Literal createTypedLiteral( String string , RDFDatatype dType)
         {
-            return new LiteralImpl(Node.createLiteral(string, "", dType), null) ;
+            return new LiteralImpl(NodeFactory.createLiteral(string, "", dType), null) ;
         }
 
         @Override
@@ -288,7 +288,7 @@ public class ResourceFactory {
             } else {
                 ll =  LiteralLabelFactory.create(value);
             }
-            return new LiteralImpl(Node.createLiteral( ll ), null) ;
+            return new LiteralImpl(NodeFactory.createLiteral( ll ), null) ;
         }
         
         @Override

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java Sun Mar 17 17:41:52 2013
@@ -207,7 +207,7 @@ public class SimpleSelector extends Obje
     }
     
     private Literal literal( String s, String lang )
-        { return new LiteralImpl( Node.createLiteral( s, lang, false ), (ModelCom) null ); }
+        { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), (ModelCom) null ); }
     
     /** Create a selector.  A model <b>may</b> restrict statements that are tested using
      * the <CODE>selects</CODE> method to those whose subject matches the

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java Sun Mar 17 17:41:52 2013
@@ -193,7 +193,7 @@ public class AltImpl extends ContainerIm
     
     @Override
     public Alt setDefault(String o, String l)  {
-        return setDefault( new LiteralImpl( Node.createLiteral( o,l, false ), getModelCom()) );
+        return setDefault( new LiteralImpl( NodeFactory.createLiteral( o,l, false ), getModelCom()) );
     }      
         
     protected Statement getDefaultStatement()  

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java Sun Mar 17 17:41:52 2013
@@ -172,7 +172,7 @@ public class ContainerImpl extends Resou
     }
 
     private Literal literal( String s, String lang )
-        { return new LiteralImpl( Node.createLiteral( s, lang, false ), getModelCom() ); }
+        { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), getModelCom() ); }
             
     @Override
     public NodeIterator iterator()  

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java Sun Mar 17 17:41:52 2013
@@ -170,10 +170,10 @@ implements Model, PrefixMapping, Lock
     }
 
     private Literal literal( String s, String lang, boolean wellFormed )
-    { return new LiteralImpl( Node.createLiteral( s, lang, wellFormed), this ); }
+    { return new LiteralImpl( NodeFactory.createLiteral( s, lang, wellFormed), this ); }
 
     private Literal literal( String lex, RDFDatatype datatype)
-    { return new LiteralImpl( Node.createLiteral( lex, "", datatype), this ); }
+    { return new LiteralImpl( NodeFactory.createLiteral( lex, "", datatype), this ); }
 
     @Override
     public Model add( Resource s, Property p, String o, String l )
@@ -464,7 +464,7 @@ implements Model, PrefixMapping, Lock
     @Override
     public StmtIterator listStatements( Resource S, Property P, String O ) {
         return O == null ? listStatements(S, P, Node.ANY) 
-                         :  listStatements( S, P, Node.createLiteral( O ) ); 
+                         :  listStatements( S, P, NodeFactory.createLiteral( O ) ); 
     }
 
     @Override
@@ -472,7 +472,7 @@ implements Model, PrefixMapping, Lock
         if (O != null) {
             // this is not OK when L is null: returns only the statements whose lang is ""
             // return listStatements( S, P, Node.createLiteral( O, L, false ) );
-            if (L != null) return listStatements( S, P, Node.createLiteral( O, L, false ) );
+            if (L != null) return listStatements( S, P, NodeFactory.createLiteral( O, L, false ) );
             // there's maybe a better way
             return new StringFilteredStmtIterator(O, listStatements(S, P, Node.ANY));
         } else {
@@ -675,7 +675,7 @@ implements Model, PrefixMapping, Lock
     @Override
     public Literal createTypedLiteral(String v)  {
         LiteralLabel ll = LiteralLabelFactory.create(v);
-        return new LiteralImpl(Node.createLiteral(ll), this);
+        return new LiteralImpl(NodeFactory.createLiteral(ll), this);
     }
 
     /**
@@ -685,7 +685,7 @@ implements Model, PrefixMapping, Lock
     public Literal createTypedLiteral(Calendar cal) {
         Object value = new XSDDateTime(cal);
         LiteralLabel ll = LiteralLabelFactory.create(value, "", XSDDatatype.XSDdateTime);
-        return new LiteralImpl(Node.createLiteral(ll), this);
+        return new LiteralImpl(NodeFactory.createLiteral(ll), this);
 
     }
 
@@ -701,7 +701,7 @@ implements Model, PrefixMapping, Lock
     @Override
     public Literal createTypedLiteral(String lex, RDFDatatype dtype) 
         throws DatatypeFormatException {
-        return new LiteralImpl( Node.createLiteral( lex, "", dtype ), this);
+        return new LiteralImpl( NodeFactory.createLiteral( lex, "", dtype ), this);
     }
 
     /**
@@ -713,7 +713,7 @@ implements Model, PrefixMapping, Lock
     @Override
     public Literal createTypedLiteral(Object value, RDFDatatype dtype) {
         LiteralLabel ll = LiteralLabelFactory.create(value, "", dtype);
-        return new LiteralImpl( Node.createLiteral(ll), this );
+        return new LiteralImpl( NodeFactory.createLiteral(ll), this );
     }
 
     /**
@@ -729,7 +729,7 @@ implements Model, PrefixMapping, Lock
     public Literal createTypedLiteral(String lex, String typeURI)  {
         RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(typeURI);
         LiteralLabel ll = LiteralLabelFactory.createLiteralLabel( lex, "", dt );
-        return new LiteralImpl( Node.createLiteral(ll), this );
+        return new LiteralImpl( NodeFactory.createLiteral(ll), this );
     }
 
     /**
@@ -742,7 +742,7 @@ implements Model, PrefixMapping, Lock
     public Literal createTypedLiteral(Object value, String typeURI) {
         RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(typeURI);
         LiteralLabel ll = LiteralLabelFactory.create(value, "", dt);
-        return new LiteralImpl(Node.createLiteral(ll), this);
+        return new LiteralImpl(NodeFactory.createLiteral(ll), this);
     }
 
     /**
@@ -758,7 +758,7 @@ implements Model, PrefixMapping, Lock
         if (value instanceof Calendar) 
             return createTypedLiteral( (Calendar)value );
         LiteralLabel ll = LiteralLabelFactory.create( value );
-        return new LiteralImpl( Node.createLiteral( ll ), this);
+        return new LiteralImpl( NodeFactory.createLiteral( ll ), this);
     }
 
     @Override
@@ -903,7 +903,7 @@ implements Model, PrefixMapping, Lock
     { return r.as( Bag.class ); }
 
     static private Node makeURI(String uri) 
-    { return uri == null ? Node.createAnon() : Node.createURI( uri ); }
+    { return uri == null ? NodeFactory.createAnon() : NodeFactory.createURI( uri ); }
 
     @Override
     public Alt getAlt( String uri )  
@@ -1338,7 +1338,7 @@ implements Model, PrefixMapping, Lock
 
      @Override
      public Resource createResource()  
-     { return IteratorFactory.asResource( Node.createAnon(),this ); }
+     { return IteratorFactory.asResource( NodeFactory.createAnon(),this ); }
 
      @Override
      public Resource createResource( String uri )  

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ReifierStd.java Sun Mar 17 17:41:52 2013
@@ -213,7 +213,7 @@ public class ReifierStd
     public static Node reifyAs(Graph graph, Node node, Triple triple)
     {
         if ( node == null )
-            node = Node.createAnon() ;
+            node = NodeFactory.createAnon() ;
         else
         {
             Triple t = getTriple(graph, node) ; 

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ResourceImpl.java Sun Mar 17 17:41:52 2013
@@ -83,7 +83,7 @@ public class ResourceImpl extends EnhNod
     }
 
     public ResourceImpl(String nameSpace, String localName) {
-        super( Node.createURI( nameSpace + localName ), null );
+        super( NodeFactory.createURI( nameSpace + localName ), null );
     }
 
     public ResourceImpl(AnonId id) {
@@ -91,7 +91,7 @@ public class ResourceImpl extends EnhNod
     }
 
     public ResourceImpl(AnonId id, ModelCom m) {
-        this( Node.createAnon( id ), m );
+        this( NodeFactory.createAnon( id ), m );
     }
 
     public ResourceImpl(String uri, ModelCom m) {
@@ -103,7 +103,7 @@ public class ResourceImpl extends EnhNod
     }
     
     public ResourceImpl(String nameSpace, String localName, ModelCom m) {
-        this( Node.createURI( nameSpace + localName ), m );
+        this( NodeFactory.createURI( nameSpace + localName ), m );
     }
 
     @Override
@@ -129,7 +129,7 @@ public class ResourceImpl extends EnhNod
         }
     
     private static Node fresh( String uri )
-        { return uri == null ? Node.createAnon() : Node.createURI( uri ); }
+        { return uri == null ? NodeFactory.createAnon() : NodeFactory.createURI( uri ); }
 
     @Override
     public AnonId getId() 

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java Sun Mar 17 17:41:52 2013
@@ -348,7 +348,7 @@ public class SeqImpl extends ContainerIm
     }
         
     private Literal literal( String s, String lang )
-        { return new LiteralImpl( Node.createLiteral( s, lang, false ), getModelCom() ); }
+        { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), getModelCom() ); }
         
     protected void shiftUp(int start, int finish)  {
         Statement stmt = null;

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java Sun Mar 17 17:41:52 2013
@@ -18,7 +18,7 @@
 
 package com.hp.hpl.jena.rdf.model.impl;
 
-import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.rdf.model.*;
 import com.hp.hpl.jena.shared.JenaException;
 
@@ -63,7 +63,7 @@ public abstract class StatementBase
 	protected StatementImpl stringReplace(String s, String lang,
 			boolean wellFormed)
 		{
-		return replace(new LiteralImpl(Node.createLiteral(s, lang, wellFormed),
+		return replace(new LiteralImpl(NodeFactory.createLiteral(s, lang, wellFormed),
 				model));
 		}
 

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/ReasonerRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/ReasonerRegistry.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/ReasonerRegistry.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/ReasonerRegistry.java Sun Mar 17 17:41:52 2013
@@ -163,7 +163,7 @@ public class ReasonerRegistry {
      * <code>node</code>s URI.
      */
     public static Node makeDirect(Node node) {
-        return Node.createURI( makeDirect( node.getURI() ) );
+        return NodeFactory.createURI( makeDirect( node.getURI() ) );
     }
 
     /**

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/FBRuleInfGraph.java Sun Mar 17 17:41:52 2013
@@ -25,10 +25,7 @@ import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype ;
 import com.hp.hpl.jena.datatypes.TypeMapper ;
-import com.hp.hpl.jena.graph.Factory ;
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.* ;
 import com.hp.hpl.jena.graph.impl.LiteralLabel ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -740,7 +737,7 @@ public class FBRuleInfGraph  extends Bas
         checkOpen();
         StandardValidityReport report = new StandardValidityReport();
         // Switch on validation
-        Triple validateOn = new Triple(Node.createAnon(), 
+        Triple validateOn = new Triple(NodeFactory.createAnon(), 
                                 ReasonerVocabulary.RB_VALIDATION.asNode(),
                                 Functor.makeFunctorNode("on", new Node[] {}));
         // We sneak this switch directly into the engine to avoid contaminating the

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Functor.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Functor.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Functor.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Functor.java Sun Mar 17 17:41:52 2013
@@ -277,7 +277,7 @@ public class Functor implements ClauseEn
      * @param f the functor data structure to be wrapped in a node.
      */
     public static Node makeFunctorNode(Functor f) {
-        return Node.createUncachedLiteral(f, null, FunctorDatatype.theFunctorDatatype);
+        return NodeFactory.createUncachedLiteral(f, null, FunctorDatatype.theFunctorDatatype);
     }
     
    /**

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java Sun Mar 17 17:41:52 2013
@@ -34,6 +34,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.rdf.model.AnonId;
 import com.hp.hpl.jena.reasoner.ReasonerException;
 import com.hp.hpl.jena.reasoner.TriplePattern;
@@ -824,9 +825,9 @@ public class Rule implements ClauseEntry
 //                return Node_RuleVariable.WILD;
             } else if (token.startsWith("<") && token.endsWith(">")) {
                 String uri = token.substring(1, token.length()-1);
-                return Node.createURI(uri);
+                return NodeFactory.createURI(uri);
             } else if (token.startsWith( "_" )) { // TODO rationalise [this is for the RIF code]
-                return Node.createAnon( new AnonId( token.substring( 1 ) ) );
+                return NodeFactory.createAnon( new AnonId( token.substring( 1 ) ) );
             } else if (token.indexOf(':') != -1) {
                 String exp = prefixMapping.expandPrefix(token); // Local map first
                 exp = PrintUtil.expandQname(exp);  // Retain global map for backward compatibility
@@ -841,7 +842,7 @@ public class Rule implements ClauseEntry
                         throw new ParserException("Unrecognized qname prefix (" + prefix + ") in rule", this);
                     }
                 }
-                return Node.createURI(exp);
+                return NodeFactory.createURI(exp);
             } else if (peekToken().equals("(")) {
                 Functor f = new Functor(token, parseNodeList(), BuiltinRegistry.theRegistry);
                 return Functor.makeFunctorNode( f );
@@ -872,9 +873,9 @@ public class Rule implements ClauseEntry
                         }
                     } 
                     RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
-                    return Node.createLiteral(lit, "", dt);
+                    return NodeFactory.createLiteral(lit, "", dt);
                 } else {
-                    return Node.createLiteral(lit, "", false);
+                    return NodeFactory.createLiteral(lit, "", false);
                 }                
             } else  if ( Character.isDigit(token.charAt(0)) || 
                          (token.charAt(0) == '-' && token.length() > 1 && Character.isDigit(token.charAt(1))) ) {
@@ -882,7 +883,7 @@ public class Rule implements ClauseEntry
                return parseNumber(token);
             } else {
                 // A  uri
-                return Node.createURI(token);
+                return NodeFactory.createURI(token);
             }
         }
         
@@ -896,17 +897,17 @@ public class Rule implements ClauseEntry
                 if (lit.indexOf(".") != -1) {
                     // Float?
                     if (XSDDatatype.XSDfloat.isValid(lit)) {
-                        return Node.createLiteral(lit, "", XSDDatatype.XSDfloat);
+                        return NodeFactory.createLiteral(lit, "", XSDDatatype.XSDfloat);
                     }
                 } else {
                     // Int?
                     if (XSDDatatype.XSDint.isValid(lit)) {
-                        return Node.createLiteral(lit, "", XSDDatatype.XSDint);
+                        return NodeFactory.createLiteral(lit, "", XSDDatatype.XSDint);
                     }
                 }
             }
             // Default is a plain literal
-            return Node.createLiteral(lit, "", false);
+            return NodeFactory.createLiteral(lit, "", false);
         }
         
         /**

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java Sun Mar 17 17:41:52 2013
@@ -213,7 +213,7 @@ public class Util {
      * Construct a new integer valued node
      */
     public static Node makeIntNode(int value) {
-        return Node.createLiteral(LiteralLabelFactory.create(new Integer(value)));
+        return NodeFactory.createLiteral(LiteralLabelFactory.create(new Integer(value)));
     }
 
     /**
@@ -221,9 +221,9 @@ public class Util {
      */
     public static Node makeLongNode(long value) {
         if (value > Integer.MAX_VALUE) {
-            return Node.createLiteral(LiteralLabelFactory.create(new Long(value)));
+            return NodeFactory.createLiteral(LiteralLabelFactory.create(new Long(value)));
         } else {
-            return Node.createLiteral(LiteralLabelFactory.create(new Integer((int)value)));
+            return NodeFactory.createLiteral(LiteralLabelFactory.create(new Integer((int)value)));
         }
     }
 
@@ -231,7 +231,7 @@ public class Util {
      * Construct a new double valued node
      */
     public static Node makeDoubleNode(double value) {
-        return Node.createLiteral(LiteralLabelFactory.create(new Double(value)));
+        return NodeFactory.createLiteral(LiteralLabelFactory.create(new Double(value)));
     }
 
     /**
@@ -247,7 +247,7 @@ public class Util {
      */
     private static Node doMakeList(Node[] nodes, int next, Graph graph) {
         if (next < nodes.length) {
-            Node listNode = Node.createAnon();
+            Node listNode = NodeFactory.createAnon();
             graph.add(new Triple(listNode, RDF.Nodes.first, nodes[next]));
             graph.add(new Triple(listNode, RDF.Nodes.rest, doMakeList(nodes, next+1, graph)));
             return listNode;

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeSkolem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeSkolem.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeSkolem.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeSkolem.java Sun Mar 17 17:41:52 2013
@@ -24,6 +24,7 @@ import java.security.NoSuchAlgorithmExce
 import org.apache.xerces.impl.dv.util.Base64;
 
 import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.rdf.model.AnonId;
 import com.hp.hpl.jena.reasoner.rulesys.RuleContext;
 import com.hp.hpl.jena.shared.JenaException;
@@ -77,7 +78,7 @@ public class MakeSkolem extends BaseBuil
             MessageDigest digester = MessageDigest.getInstance("MD5");
             digester.reset();
             byte[] digest = digester.digest(key.toString().getBytes());
-            Node skolem = Node.createAnon( new AnonId( Base64.encode(digest) ) );
+            Node skolem = NodeFactory.createAnon( new AnonId( Base64.encode(digest) ) );
             return context.getEnv().bind(args[0], skolem); 
             
         } catch (NoSuchAlgorithmException e) {

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeTemp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeTemp.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeTemp.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/MakeTemp.java Sun Mar 17 17:41:52 2013
@@ -48,7 +48,7 @@ public class MakeTemp extends BaseBuilti
     @Override
     public boolean bodyCall(Node[] args, int length, RuleContext context) {
         for (int i = 0; i < length; i++) {
-            if (!context.getEnv().bind(args[i], Node.createAnon())) return false;
+            if (!context.getEnv().bind(args[i], NodeFactory.createAnon())) return false;
         }
         return true;   
     }

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Now.java Sun Mar 17 17:41:52 2013
@@ -22,6 +22,7 @@ import java.util.Calendar;
 
 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.graph.impl.LiteralLabelFactory;
 import com.hp.hpl.jena.reasoner.rulesys.BindingEnvironment;
 import com.hp.hpl.jena.reasoner.rulesys.RuleContext;
@@ -60,7 +61,7 @@ public class Now extends BaseBuiltin {
     public boolean bodyCall(Node[] args, int length, RuleContext context) {
         checkArgs(length, context);
         BindingEnvironment env = context.getEnv();
-        Node now = Node.createLiteral( LiteralLabelFactory.create(new XSDDateTime(Calendar.getInstance())) );
+        Node now = NodeFactory.createLiteral( LiteralLabelFactory.create(new XSDDateTime(Calendar.getInstance())) );
         return env.bind(args[0], now);
     }
 }

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Regex.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Regex.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Regex.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/Regex.java Sun Mar 17 17:41:52 2013
@@ -22,6 +22,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.reasoner.rulesys.BindingEnvironment;
 import com.hp.hpl.jena.reasoner.rulesys.BuiltinException;
 import com.hp.hpl.jena.reasoner.rulesys.RuleContext;
@@ -68,7 +69,7 @@ public class Regex extends BaseBuiltin {
             BindingEnvironment env = context.getEnv();
             for (int i = 0; i < Math.min(length-2, m.groupCount()); i++) {
                 String gm = m.group(i+1);
-                Node match =  (gm != null) ? Node.createLiteral( gm ) : Node.createLiteral("");
+                Node match =  (gm != null) ? NodeFactory.createLiteral( gm ) : NodeFactory.createLiteral("");
                 if ( !env.bind(args[i+2], match) ) return false;
             }
         }

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/StrConcat.java Sun Mar 17 17:41:52 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.reasoner.rulesys.builtins;
 
 import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.reasoner.rulesys.BuiltinException;
 import com.hp.hpl.jena.reasoner.rulesys.RuleContext;
 
@@ -65,7 +66,7 @@ public class StrConcat extends BaseBuilt
         for (int i = 0; i < length-1; i++) {
             buff.append( lex(getArg(i, args, context), context) );
         }
-        Node result = Node.createLiteral(buff.toString());
+        Node result = NodeFactory.createLiteral(buff.toString());
         return context.getEnv().bind(args[length-1], result);
     }
     

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/UriConcat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/UriConcat.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/UriConcat.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/builtins/UriConcat.java Sun Mar 17 17:41:52 2013
@@ -19,6 +19,7 @@
 package com.hp.hpl.jena.reasoner.rulesys.builtins;
 
 import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.reasoner.rulesys.BuiltinException;
 import com.hp.hpl.jena.reasoner.rulesys.RuleContext;
 
@@ -56,7 +57,7 @@ public class UriConcat extends StrConcat
         for (int i = 0; i < length-1; i++) {
             buff.append( lex(getArg(i, args, context), context) );
         }
-        Node result = Node.createURI( buff.toString() );
+        Node result = NodeFactory.createURI( buff.toString() );
         return context.getEnv().bind(args[length-1], result);
     }
 }

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingStack.java Sun Mar 17 17:41:52 2013
@@ -208,11 +208,11 @@ public class BindingStack implements Bin
     @Override
     public Triple instantiate(TriplePattern pattern) {
         Node s = getGroundVersion(pattern.getSubject());
-        if (s.isVariable()) s = Node.createAnon();
+        if (s.isVariable()) s = NodeFactory.createAnon();
         Node p = getGroundVersion(pattern.getPredicate());
-        if (p.isVariable()) p = Node.createAnon();
+        if (p.isVariable()) p = NodeFactory.createAnon();
         Node o = getGroundVersion(pattern.getObject());
-        if (o.isVariable()) o = Node.createAnon();
+        if (o.isVariable()) o = NodeFactory.createAnon();
         return new Triple(s, p, o);
     }
     

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/BindingVector.java Sun Mar 17 17:41:52 2013
@@ -191,11 +191,11 @@ public class BindingVector implements Bi
     @Override
     public Triple instantiate(TriplePattern pattern) {
         Node s = getGroundVersion(pattern.getSubject());
-        if (s.isVariable()) s = Node.createAnon();
+        if (s.isVariable()) s = NodeFactory.createAnon();
         Node p = getGroundVersion(pattern.getPredicate());
-        if (p.isVariable()) p = Node.createAnon();
+        if (p.isVariable()) p = NodeFactory.createAnon();
         Node o = getGroundVersion(pattern.getObject());
-        if (o.isVariable()) o = Node.createAnon();
+        if (o.isVariable()) o = NodeFactory.createAnon();
         return new Triple(s, p, o);
     }
     

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/LPBindingEnvironment.java Sun Mar 17 17:41:52 2013
@@ -80,11 +80,11 @@ public class LPBindingEnvironment implem
     @Override
     public Triple instantiate(TriplePattern pattern) {
         Node s = getGroundVersion(pattern.getSubject());
-        if (s.isVariable()) s = Node.createAnon();
+        if (s.isVariable()) s = NodeFactory.createAnon();
         Node p = getGroundVersion(pattern.getPredicate());
-        if (p.isVariable()) p = Node.createAnon();
+        if (p.isVariable()) p = NodeFactory.createAnon();
         Node o = getGroundVersion(pattern.getObject());
-        if (o.isVariable()) o = Node.createAnon();
+        if (o.isVariable()) o = NodeFactory.createAnon();
         return new Triple(s, p, o);
     }
 

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RuleClauseCode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RuleClauseCode.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RuleClauseCode.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/RuleClauseCode.java Sun Mar 17 17:41:52 2013
@@ -822,7 +822,7 @@ public class RuleClauseCode {
             String test22 = "(?C p ?D) <- (?C rb:xsdBase ?BC), (?D rb:xsdBase ?BD), notEqual(?BC, ?BD).";
             store.addRule(Rule.parseRule(test22));
             System.out.println("Code for p:");
-            List<RuleClauseCode> codeList = store.codeFor(Node.createURI("p"));
+            List<RuleClauseCode> codeList = store.codeFor(NodeFactory.createURI("p"));
             RuleClauseCode code = codeList.get(0);
             code.print(System.out);
         } catch (Exception e) {

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TempNodeCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TempNodeCache.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TempNodeCache.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/impl/TempNodeCache.java Sun Mar 17 17:41:52 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.reasoner.rulesys
 import java.util.*;
 
 import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
 import com.hp.hpl.jena.reasoner.InfGraph;
 import com.hp.hpl.jena.util.OneToManyMap;
 
@@ -77,7 +78,7 @@ public class TempNodeCache {
         }
         if (result == null) {
             // No value yet, so create one
-            result = Node.createAnon();
+            result = NodeFactory.createAnon();
             ipMap.put(ip, result);
             if (pclass != null) {
                 classMap.put(result, pclass);

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/enhanced/test/TestPackage.java Sun Mar 17 17:41:52 2013
@@ -415,9 +415,9 @@ public class TestPackage extends GraphTe
         Graph g = Factory.createGraphMem();
         Personality<RDFNode> ours = BuiltinPersonalities.model.copy().add( Example.class, Example.factory );
         EnhGraph eg = new EnhGraph( g, ours ); 
-        Node n = Node.createURI( "spoo:bar" );
-        EnhNode eNode = new EnhNode( Node.createURI( "spoo:bar" ), eg );
-        EnhNode eBlank = new EnhNode( Node.createAnon(), eg );
+        Node n = NodeFactory.createURI( "spoo:bar" );
+        EnhNode eNode = new EnhNode( NodeFactory.createURI( "spoo:bar" ), eg );
+        EnhNode eBlank = new EnhNode( NodeFactory.createAnon(), eg );
         assertTrue( "URI node can be an Example", eNode.supports( Example.class ) );
         assertFalse( "Blank node cannot be an Example", eBlank.supports( Example.class ) );
         }

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifier.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifier.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifier.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/AbstractTestReifier.java Sun Mar 17 17:41:52 2013
@@ -18,10 +18,7 @@
 
 package com.hp.hpl.jena.graph.test;
 
-import com.hp.hpl.jena.graph.Factory ;
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.* ;
 import com.hp.hpl.jena.rdf.model.impl.ReifierStd ;
 import com.hp.hpl.jena.shared.AlreadyReifiedException ;
 import com.hp.hpl.jena.shared.CannotReifyException ;
@@ -151,7 +148,7 @@ public abstract class AbstractTestReifie
     public void testRetrieveTriplesByNode()
     {
         Graph G = getGraph();
-        Node N = Node.createAnon(), M = Node.createAnon();
+        Node N = NodeFactory.createAnon(), M = NodeFactory.createAnon();
         ReifierStd.reifyAs( G , N, triple( "x R y" ) );
         assertEquals( "gets correct triple", triple( "x R y" ), ReifierStd.getTriple( G , N ) );
         ReifierStd.reifyAs( G, M, triple( "p S q" ) );
@@ -160,7 +157,7 @@ public abstract class AbstractTestReifie
 
         assertTrue( "node is known bound", ReifierStd.hasTriple( G, M ) );
         assertTrue( "node is known bound", ReifierStd.hasTriple( G, N ) );
-        assertFalse( "node is known unbound", ReifierStd.hasTriple( G, Node.createURI( "any:thing" ) ) );
+        assertFalse( "node is known unbound", ReifierStd.hasTriple( G, NodeFactory.createURI( "any:thing" ) ) );
     }
 
     public void testRetrieveTriplesByTriple()
@@ -176,7 +173,7 @@ public abstract class AbstractTestReifie
     public void testReifyAs()
     {
         Graph G = getGraph();
-        Node X = Node.createURI( "some:uri" );
+        Node X = NodeFactory.createURI( "some:uri" );
         assertEquals( "node used", X, ReifierStd.reifyAs( G, X, triple( "x R y" ) ) );
         assertEquals( "retrieves correctly", triple( "x R y" ), ReifierStd.getTriple( G, X ) );
     }

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/NodeCreateUtils.java Sun Mar 17 17:41:52 2013
@@ -22,6 +22,7 @@ import java.util.StringTokenizer;
 
 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.graph.impl.LiteralLabel;
 import com.hp.hpl.jena.graph.impl.LiteralLabelFactory;
@@ -78,22 +79,22 @@ public class NodeCreateUtils
             throw new JenaException( "Node.create does not accept an empty string as argument" );
         char first = x.charAt( 0 );
         if (first == '\'' || first == '\"')
-            return Node.createLiteral( newString( pm, first, x ) );
+            return NodeFactory.createLiteral( newString( pm, first, x ) );
         if (Character.isDigit( first )) 
-            return Node.createLiteral( x, "", XSDDatatype.XSDinteger );
+            return NodeFactory.createLiteral( x, "", XSDDatatype.XSDinteger );
         if (first == '_')
-            return Node.createAnon( new AnonId( x ) );
+            return NodeFactory.createAnon( new AnonId( x ) );
         if (x.equals( "??" ))
             return Node.ANY;
         if (first == '?')
-            return Node.createVariable( x.substring( 1 ) );
+            return NodeFactory.createVariable( x.substring( 1 ) );
         if (first == '&')
-            return Node.createURI( "q:" + x.substring( 1 ) );        
+            return NodeFactory.createURI( "q:" + x.substring( 1 ) );        
         int colon = x.indexOf( ':' );
         String d = pm.getNsPrefixURI( "" );
         return colon < 0 
-            ? Node.createURI( (d == null ? "eh:/" : d) + x )
-            : Node.createURI( pm.expandPrefix( x ) )
+            ? NodeFactory.createURI( (d == null ? "eh:/" : d) + x )
+            : NodeFactory.createURI( pm.expandPrefix( x ) )
             ;
         }
 
@@ -134,7 +135,7 @@ public class NodeCreateUtils
         int colon = langOrType.indexOf( ':' );
         return colon < 0 
             ? LiteralLabelFactory.create( content, langOrType, false )
-            : LiteralLabelFactory.createLiteralLabel( content, "", Node.getType( pm.expandPrefix( langOrType ) ) )
+            : LiteralLabelFactory.createLiteralLabel( content, "", NodeFactory.getType( pm.expandPrefix( langOrType ) ) )
             ;
         }
 

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestFindLiterals.java Sun Mar 17 17:41:52 2013
@@ -24,6 +24,7 @@ import junit.framework.TestSuite;
 
 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.graph.impl.LiteralLabelFactory;
 import com.hp.hpl.jena.util.iterator.Map1;
@@ -110,10 +111,10 @@ public class TestFindLiterals extends Gr
     
     public void testProgrammaticValues() 
         {
-        Node ab = Node.createLiteral( LiteralLabelFactory.create( new Byte((byte)42) ) );
-        Node as = Node.createLiteral( LiteralLabelFactory.create( new Short((short)42) ) );
-        Node ai = Node.createLiteral( LiteralLabelFactory.create( new Integer(42) ) );
-        Node al = Node.createLiteral( LiteralLabelFactory.create( new Long(42) ) );
+        Node ab = NodeFactory.createLiteral( LiteralLabelFactory.create( new Byte((byte)42) ) );
+        Node as = NodeFactory.createLiteral( LiteralLabelFactory.create( new Short((short)42) ) );
+        Node ai = NodeFactory.createLiteral( LiteralLabelFactory.create( new Integer(42) ) );
+        Node al = NodeFactory.createLiteral( LiteralLabelFactory.create( new Long(42) ) );
         Graph g = graphWith( "" );
         Node SB = NodeCreateUtils.create( "SB" );
         Node SS = NodeCreateUtils.create( "SS" );

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java Sun Mar 17 17:41:52 2013
@@ -54,39 +54,39 @@ public class TestNode extends GraphTestB
 
     public void testBlanks()
         {
-        assertTrue( "anonymous nodes are blank", Node.createAnon().isBlank() );
-        assertFalse( "anonymous nodes aren't literal", Node.createAnon().isLiteral() );
-        assertFalse( "anonymous nodes aren't URIs", Node.createAnon().isURI() );
-        assertFalse( "anonymous nodes aren't variables", Node.createAnon().isVariable() );
-        assertEquals( "anonymous nodes have the right id", Node.createAnon(A).getBlankNodeId(), A );
+        assertTrue( "anonymous nodes are blank", NodeFactory.createAnon().isBlank() );
+        assertFalse( "anonymous nodes aren't literal", NodeFactory.createAnon().isLiteral() );
+        assertFalse( "anonymous nodes aren't URIs", NodeFactory.createAnon().isURI() );
+        assertFalse( "anonymous nodes aren't variables", NodeFactory.createAnon().isVariable() );
+        assertEquals( "anonymous nodes have the right id", NodeFactory.createAnon(A).getBlankNodeId(), A );
         }
         
     public void testLiterals()
         {
-        assertFalse( "literal nodes aren't blank", Node.createLiteral( L ).isBlank() );
-        assertTrue( "literal nodes are literal", Node.createLiteral( L ).isLiteral() );
-        assertFalse( "literal nodes aren't variables", Node.createLiteral( L ).isVariable() );
-        assertFalse( "literal nodes aren't URIs", Node.createLiteral( L ).isURI() );
-        assertEquals( "literal nodes preserve value", Node.createLiteral( L ).getLiteral(), L );
+        assertFalse( "literal nodes aren't blank", NodeFactory.createLiteral( L ).isBlank() );
+        assertTrue( "literal nodes are literal", NodeFactory.createLiteral( L ).isLiteral() );
+        assertFalse( "literal nodes aren't variables", NodeFactory.createLiteral( L ).isVariable() );
+        assertFalse( "literal nodes aren't URIs", NodeFactory.createLiteral( L ).isURI() );
+        assertEquals( "literal nodes preserve value", NodeFactory.createLiteral( L ).getLiteral(), L );
         }
         
     public void testURIs()
         {
-        assertFalse( "URI nodes aren't blank", Node.createURI( U ).isBlank() );
-        assertFalse( "URI nodes aren't literal", Node.createURI( U ).isLiteral() );
-        assertFalse( "URI nodes aren't variables", Node.createURI( U ).isVariable() );
-        assertTrue( "URI nodes are URIs", Node.createURI( U ).isURI() );
-        assertEquals( "URI nodes preserve URI", Node.createURI( U ).getURI(), U );
+        assertFalse( "URI nodes aren't blank", NodeFactory.createURI( U ).isBlank() );
+        assertFalse( "URI nodes aren't literal", NodeFactory.createURI( U ).isLiteral() );
+        assertFalse( "URI nodes aren't variables", NodeFactory.createURI( U ).isVariable() );
+        assertTrue( "URI nodes are URIs", NodeFactory.createURI( U ).isURI() );
+        assertEquals( "URI nodes preserve URI", NodeFactory.createURI( U ).getURI(), U );
         }
         
     public void testVariables()
         {
-        assertFalse( "variable nodes aren't blank", Node.createVariable( N ).isBlank() );
-        assertFalse( "variable nodes aren't literal", Node.createVariable( N ).isLiteral() );        
-        assertFalse( "variable nodes aren't URIs", Node.createVariable( N ).isURI() );
-        assertTrue( "variable nodes are variable", Node.createVariable( N ).isVariable() );
-        assertEquals( "variable nodes keep their name", N, Node.createVariable( N ).getName() );
-        assertEquals( "variable nodes keep their name", N + "x", Node.createVariable( N + "x" ).getName() );
+        assertFalse( "variable nodes aren't blank", NodeFactory.createVariable( N ).isBlank() );
+        assertFalse( "variable nodes aren't literal", NodeFactory.createVariable( N ).isLiteral() );        
+        assertFalse( "variable nodes aren't URIs", NodeFactory.createVariable( N ).isURI() );
+        assertTrue( "variable nodes are variable", NodeFactory.createVariable( N ).isVariable() );
+        assertEquals( "variable nodes keep their name", N, NodeFactory.createVariable( N ).getName() );
+        assertEquals( "variable nodes keep their name", N + "x", NodeFactory.createVariable( N + "x" ).getName() );
         }
         
     public void testANY()
@@ -101,9 +101,9 @@ public class TestNode extends GraphTestB
     
     public void testNodeVariableConstructor()
         {
-        assertEquals( Node.createVariable( "hello" ), new Node_Variable( "hello" ) );
-        assertEquals( Node.createVariable( "world" ), new Node_Variable( "world" ) );
-        assertDiffer( Node.createVariable( "hello" ), new Node_Variable( "world" ) );
+        assertEquals( NodeFactory.createVariable( "hello" ), new Node_Variable( "hello" ) );
+        assertEquals( NodeFactory.createVariable( "world" ), new Node_Variable( "world" ) );
+        assertDiffer( NodeFactory.createVariable( "hello" ), new Node_Variable( "world" ) );
         assertEquals( "myName", new Node_Variable( "myName" ).getName() );
         }
         
@@ -127,22 +127,22 @@ public class TestNode extends GraphTestB
         return new Object [][]
             {
             { Node.ANY, "0" },
-            { Node.createAnon( id ), "1" },
-            { Node.createAnon(), "2" },
-            { Node.createAnon( id ), "1" },
-            { Node.createLiteral( L ), "3" },
-
-            { Node.createLiteral( L2 ), "4" },
-            { Node.createLiteral( L ), "3" },
-            { Node.createURI( U ), "5" },
-            { Node.createURI( U2 ), "6" },
-            { Node.createURI( U ), "5" },
-            { Node.createVariable( N ), "7" },
-            { Node.createVariable( N2 ), "8" },
-            { Node.createVariable( N ), "7" } ,
+            { NodeFactory.createAnon( id ), "1" },
+            { NodeFactory.createAnon(), "2" },
+            { NodeFactory.createAnon( id ), "1" },
+            { NodeFactory.createLiteral( L ), "3" },
+
+            { NodeFactory.createLiteral( L2 ), "4" },
+            { NodeFactory.createLiteral( L ), "3" },
+            { NodeFactory.createURI( U ), "5" },
+            { NodeFactory.createURI( U2 ), "6" },
+            { NodeFactory.createURI( U ), "5" },
+            { NodeFactory.createVariable( N ), "7" },
+            { NodeFactory.createVariable( N2 ), "8" },
+            { NodeFactory.createVariable( N ), "7" } ,
 
-            { Node.createLiteral( LLang1 ), "9" },
-            { Node.createLiteral( LLang2 ), "10" },
+            { NodeFactory.createLiteral( LLang1 ), "9" },
+            { NodeFactory.createLiteral( LLang2 ), "10" },
             };
     }
         
@@ -179,15 +179,15 @@ public class TestNode extends GraphTestB
         
     public void testEquals()
     {
-        assertDiffer( "different variables", Node.createVariable( "xx" ), Node.createVariable( "yy" ) );
-        assertEquals( "same vars", Node.createVariable( "aa" ), Node.createVariable( "aa" ) );
-        assertEquals( "same URI", Node.createURI( U ), Node.createURI( U ) );
-        assertEquals( "same anon", Node.createAnon( A ), Node.createAnon( A ) );
-        assertEquals( "same literal", Node.createLiteral( L ), Node.createLiteral( L ) );
-        assertFalse( "distinct URIs", Node.createURI( U ) == Node.createURI( U ) );
-        assertFalse( "distinct hyphens", Node.createAnon( A ) == Node.createAnon( A ) );
-        assertFalse( "distinct literals", Node.createLiteral( L ) == Node.createLiteral( L ) );
-        assertFalse( "distinct vars", Node.createVariable( "aa" ) == Node.createVariable( "aa" ) );
+        assertDiffer( "different variables", NodeFactory.createVariable( "xx" ), NodeFactory.createVariable( "yy" ) );
+        assertEquals( "same vars", NodeFactory.createVariable( "aa" ), NodeFactory.createVariable( "aa" ) );
+        assertEquals( "same URI", NodeFactory.createURI( U ), NodeFactory.createURI( U ) );
+        assertEquals( "same anon", NodeFactory.createAnon( A ), NodeFactory.createAnon( A ) );
+        assertEquals( "same literal", NodeFactory.createLiteral( L ), NodeFactory.createLiteral( L ) );
+        assertFalse( "distinct URIs", NodeFactory.createURI( U ) == NodeFactory.createURI( U ) );
+        assertFalse( "distinct hyphens", NodeFactory.createAnon( A ) == NodeFactory.createAnon( A ) );
+        assertFalse( "distinct literals", NodeFactory.createLiteral( L ) == NodeFactory.createLiteral( L ) );
+        assertFalse( "distinct vars", NodeFactory.createVariable( "aa" ) == NodeFactory.createVariable( "aa" ) );
     }
 
     /**
@@ -197,10 +197,10 @@ public class TestNode extends GraphTestB
     public void testLabels()
         {
         AnonId id = AnonId.create();
-        assertEquals( "get URI value", U, Node.createURI( U ).getURI() );
-        assertEquals( "get blank value", id, Node.createAnon( id ).getBlankNodeId() );
-        assertEquals( "get literal value", L, Node.createLiteral( L ).getLiteral() );
-        assertEquals( "get variable name", N, Node.createVariable( N ).getName() );
+        assertEquals( "get URI value", U, NodeFactory.createURI( U ).getURI() );
+        assertEquals( "get blank value", id, NodeFactory.createAnon( id ).getBlankNodeId() );
+        assertEquals( "get literal value", L, NodeFactory.createLiteral( L ).getLiteral() );
+        assertEquals( "get variable name", N, NodeFactory.createVariable( N ).getName() );
         }
         
     /**
@@ -209,8 +209,8 @@ public class TestNode extends GraphTestB
     */
     public void testFailingLabels()
         {
-        Node u = Node.createURI( U ), b = Node.createAnon();
-        Node l = Node.createLiteral( L ), v = Node.createVariable( N );
+        Node u = NodeFactory.createURI( U ), b = NodeFactory.createAnon();
+        Node l = NodeFactory.createLiteral( L ), v = NodeFactory.createVariable( N );
         Node a = Node.ANY;
     /* */
         testGetURIFails( a );
@@ -249,7 +249,7 @@ public class TestNode extends GraphTestB
     
     public void testGetBlankNodeLabelString()
         {
-        Node n = Node.createAnon();
+        Node n = NodeFactory.createAnon();
         assertEquals( n.getBlankNodeId().getLabelString(), n.getBlankNodeLabel() );
         }
     
@@ -580,8 +580,8 @@ public class TestNode extends GraphTestB
         TypeMapper tm = TypeMapper.getInstance();
         RDFDatatype dt1 = tm.getTypeByValue( new Integer( 10 ) );
         RDFDatatype dt2 = tm.getTypeByValue( new Short( (short) 10 ) );
-        Node a = Node.createLiteral( "10", "", dt1 );
-        Node b = Node.createLiteral( "10", "", dt2 );
+        Node a = NodeFactory.createLiteral( "10", "", dt1 );
+        Node b = NodeFactory.createLiteral( "10", "", dt2 );
         assertDiffer( "types must make a difference", a, b );
         assertTrue( "A and B must express the same value", a.sameValueAs( b ) );
         assertTrue( "matching literals must respect sameValueAs", a.matches( b ) );
@@ -591,9 +591,9 @@ public class TestNode extends GraphTestB
         {
         TypeMapper tm = TypeMapper.getInstance();
         RDFDatatype dtInt = tm.getTypeByValue( new Integer( 10 ) );
-        Node plain = Node.createLiteral( "rhubarb", "", false );    
-        Node english = Node.createLiteral( "eccentric", "en_UK", false );
-        Node typed = Node.createLiteral( "10", "", dtInt );
+        Node plain = NodeFactory.createLiteral( "rhubarb", "", false );    
+        Node english = NodeFactory.createLiteral( "eccentric", "en_UK", false );
+        Node typed = NodeFactory.createLiteral( "10", "", dtInt );
         assertEquals( "\"rhubarb\"", plain.toString() );
         assertEquals( "rhubarb", plain.toString( false ) );
         assertEquals( "\"eccentric\"@en_UK", english.toString() );
@@ -641,8 +641,8 @@ public class TestNode extends GraphTestB
         assertFalse( NodeCreateUtils.create( "'notXML'" ).getLiteralIsXML() );
         assertFalse( NodeCreateUtils.create( "17" ).getLiteralIsXML() );
         assertFalse( NodeCreateUtils.create( "'joke'xsd:Joke" ).getLiteralIsXML() );
-        assertTrue( Node.createLiteral( "lit", "lang", true ).getLiteralIsXML() );
-        assertFalse( Node.createLiteral( "lit", "lang", false ).getLiteralIsXML() );
+        assertTrue( NodeFactory.createLiteral( "lit", "lang", true ).getLiteralIsXML() );
+        assertFalse( NodeFactory.createLiteral( "lit", "lang", false ).getLiteralIsXML() );
         }
    
     public void testConcrete()

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTriple.java Sun Mar 17 17:41:52 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.graph.test;
 import junit.framework.TestSuite ;
 
 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.impl.LiteralLabel ;
 import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
@@ -49,10 +50,10 @@ public class TestTriple extends GraphTes
 
         Node[] nodes = new Node[] {
             Node.ANY,
-            Node.createAnon(id),    Node.createAnon(),
-            Node.createLiteral(L),  Node.createLiteral(L2),
-            Node.createURI(U),      Node.createURI(U2),
-            Node.createVariable(N), Node.createVariable(N2)
+            NodeFactory.createAnon(id),    NodeFactory.createAnon(),
+            NodeFactory.createLiteral(L),  NodeFactory.createLiteral(L2),
+            NodeFactory.createURI(U),      NodeFactory.createURI(U2),
+            NodeFactory.createVariable(N), NodeFactory.createVariable(N2)
         };
 
         Triple[] triples = 

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestTypedLiterals.java Sun Mar 17 17:41:52 2013
@@ -35,10 +35,7 @@ import com.hp.hpl.jena.datatypes.TypeMap
 import com.hp.hpl.jena.datatypes.xsd.* ;
 import com.hp.hpl.jena.datatypes.xsd.impl.XMLLiteralType ;
 import com.hp.hpl.jena.enhanced.EnhNode ;
-import com.hp.hpl.jena.graph.Factory ;
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.graph.* ;
 import com.hp.hpl.jena.graph.impl.LiteralLabel ;
 import com.hp.hpl.jena.graph.impl.LiteralLabelFactory ;
 import com.hp.hpl.jena.rdf.model.* ;
@@ -451,10 +448,10 @@ public class TestTypedLiterals extends T
      */
     public void testDecimalFind() {
         RDFDatatype dt = XSDDatatype.XSDdecimal;
-        Node ns = Node.createURI("x") ;
-        Node np = Node.createURI("p") ;
-        Node nx1 = Node.createLiteral("0.50", null, dt) ;
-        Node nx2 = Node.createLiteral("0.500", null, dt) ;
+        Node ns = NodeFactory.createURI("x") ;
+        Node np = NodeFactory.createURI("p") ;
+        Node nx1 = NodeFactory.createLiteral("0.50", null, dt) ;
+        Node nx2 = NodeFactory.createLiteral("0.500", null, dt) ;
         Graph graph = Factory.createDefaultGraph() ;
         graph.add(new Triple(ns, np, nx1)) ;
         assertTrue( graph.find(Node.ANY, Node.ANY, nx2).hasNext() );  
@@ -892,8 +889,8 @@ public class TestTypedLiterals extends T
     
     /** Test that XSD anyURI is not sameValueAs XSD string (Xerces returns a string as the value for both) */ 
     public void testXSDanyURI() {
-        Node node1 = Node.createLiteral("http://example/", null, XSDDatatype.XSDanyURI) ;
-        Node node2 = Node.createLiteral("http://example/", null, XSDDatatype.XSDstring) ;
+        Node node1 = NodeFactory.createLiteral("http://example/", null, XSDDatatype.XSDanyURI) ;
+        Node node2 = NodeFactory.createLiteral("http://example/", null, XSDDatatype.XSDstring) ;
         assertFalse(node1.sameValueAs(node2)) ;
     }
     



Mime
View raw message