You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/01/01 17:17:44 UTC
svn commit: r1427455 - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/n3/ main/java/com/hp/hpl/jena/rdf/model/
main/java/com/hp/hpl/jena/rdf/model/impl/
main/java/com/hp/hpl/jena/xmloutput/impl/
test/java/com/hp/hpl/jena/rdf/model/test/
Author: andy
Date: Tue Jan 1 16:17:43 2013
New Revision: 1427455
URL: http://svn.apache.org/viewvc?rev=1427455&view=rev
Log:
Hunt down and deprecate withHiddenStatements (no statements are hidden with the simplified reification).
Removed:
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestHiddenStatements.java
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelFactory.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/ModelReifier.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java?rev=1427455&r1=1427454&r2=1427455&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/N3JenaWriterCommon.java Tue Jan 1 16:17:43 2013
@@ -232,10 +232,9 @@ public class N3JenaWriterCommon implemen
protected void finishWriting() {}
protected void prepare(Model model) {}
- protected void processModel(Model baseModel)
+ protected void processModel(Model model)
{
- prefixMap = baseModel.getNsPrefixMap() ;
- Model model = ModelFactory.withHiddenStatements( baseModel );
+ prefixMap = model.getNsPrefixMap() ;
bNodesMap = new HashMap<Resource, String>() ;
// PrefixMapping (to Jena 2.5.7 at least)
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelFactory.java?rev=1427455&r1=1427454&r2=1427455&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelFactory.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelFactory.java Tue Jan 1 16:17:43 2013
@@ -34,7 +34,6 @@ import com.hp.hpl.jena.ontology.impl.Ont
import com.hp.hpl.jena.rdf.model.impl.InfModelImpl ;
import com.hp.hpl.jena.rdf.model.impl.ModelCom ;
import com.hp.hpl.jena.rdf.model.impl.ModelMakerImpl ;
-import com.hp.hpl.jena.rdf.model.impl.ModelReifier ;
import com.hp.hpl.jena.reasoner.InfGraph ;
import com.hp.hpl.jena.reasoner.Reasoner ;
import com.hp.hpl.jena.reasoner.ReasonerRegistry ;
@@ -152,9 +151,11 @@ public class ModelFactory extends ModelF
Answer a read-only Model with all the statements of this Model and any
statements "hidden" by reification. That model is dynamic, ie
any changes this model will be reflected that one.
+ @deprecated Hidden partial reifications not supported -- only style "Standard"
*/
+ @Deprecated
public static Model withHiddenStatements( Model m )
- { return ModelReifier.withHiddenStatements( m ); }
+ { return m ; }
/**
construct a new memory-based model that does not capture reification triples
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=1427455&r1=1427454&r2=1427455&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 Tue Jan 1 16:17:43 2013
@@ -1502,12 +1502,14 @@ implements Model, PrefixMapping, Lock
return b.toString();
}
/**
- a read-only Model with all the statements of this Model and any
+ A Model with all the statements of this Model and any
statements "hidden" by reification. That model is dynamic, ie
any changes this model will be reflected that one.
+ @deprecated Reifiying triples are already visible.
*/
+ @Deprecated
public Model getHiddenStatements()
- { return modelReifier.getHiddenStatements(); }
+ { return this ; }
/**
Answer whether or not these two graphs are isomorphic, taking the
@@ -1516,8 +1518,8 @@ implements Model, PrefixMapping, Lock
@Override
public boolean isIsomorphicWith( Model m )
{
- Graph L = ModelFactory.withHiddenStatements( this ).getGraph();
- Graph R = ModelFactory.withHiddenStatements( m ).getGraph();
+ Graph L = this.getGraph();
+ Graph R = m.getGraph();
return L.isIsomorphicWith( R );
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java?rev=1427455&r1=1427454&r2=1427455&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelReifier.java Tue Jan 1 16:17:43 2013
@@ -18,17 +18,20 @@
package com.hp.hpl.jena.rdf.model.impl;
-import com.hp.hpl.jena.rdf.model.*;
-import com.hp.hpl.jena.shared.*;
-import com.hp.hpl.jena.graph.*;
-import com.hp.hpl.jena.graph.compose.*;
-import com.hp.hpl.jena.graph.impl.GraphBase;
-import com.hp.hpl.jena.util.iterator.*;
+import com.hp.hpl.jena.graph.FrontsTriple ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.shared.AlreadyReifiedException ;
+import com.hp.hpl.jena.shared.ReificationStyle ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.Map1 ;
/**
This class impedance-matches the reification requests of Model[Com] to the operations
supplied by it's Graph's Reifier.
*/
+@SuppressWarnings("deprecation")
public class ModelReifier
{
private ModelCom model;
@@ -58,34 +61,23 @@ public class ModelReifier
added.
@param m a model that may have reified statements
@return a new model, the union of m and the reification statements of m
+ @deprecated Reifiying triples are already visible.
*/
+ @Deprecated
public static Model withHiddenStatements( Model m )
- {
- Graph mGraph = m.getGraph();
- Graph hiddenTriples = getHiddenTriples( m );
- return new ModelCom( new DisjointUnion( mGraph, hiddenTriples ) );
- }
-
- /**
- @param mGraph
- @return
- */
- protected static Graph getHiddenTriples( Model m )
{
- final Graph mGraph = m.getGraph();
- return new GraphBase()
- {
- @Override public ExtendedIterator<Triple> graphBaseFind( TripleMatch m )
- { return ReifierStd.findEither(mGraph, m, true ); }
- };
+ // With Reification standard, reifiying triples are already visible.
+ return m ;
}
/**
Answer a model that consists of the hidden reification statements of this model.
@return a new model containing the hidden statements of this model
+ @deprecated Reifiying triples are already visible.
*/
+ @Deprecated
public Model getHiddenStatements()
- { return new ModelCom( getHiddenTriples( model ) ); }
+ { return model ; }
/**
Answer a fresh reification of a statement associated with a fresh bnode.
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java?rev=1427455&r1=1427454&r2=1427455&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/NTripleWriter.java Tue Jan 1 16:17:43 2013
@@ -59,10 +59,9 @@ public class NTripleWriter extends Objec
}
}
@Override
- public void write(Model baseModel, Writer writer, String base)
+ public void write(Model model, Writer writer, String base)
{
try {
- Model model = ModelFactory.withHiddenStatements(baseModel);
PrintWriter pw;
if (writer instanceof PrintWriter) {
pw = (PrintWriter) writer;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java?rev=1427455&r1=1427454&r2=1427455&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/xmloutput/impl/BaseXMLWriter.java Tue Jan 1 16:17:43 2013
@@ -18,53 +18,31 @@
package com.hp.hpl.jena.xmloutput.impl;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
-import org.apache.xerces.util.XMLChar;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.hp.hpl.jena.JenaRuntime;
-import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
-import com.hp.hpl.jena.rdf.model.AnonId;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.NsIterator;
-import com.hp.hpl.jena.rdf.model.RDFErrorHandler;
-import com.hp.hpl.jena.rdf.model.RDFWriter;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
-import com.hp.hpl.jena.rdf.model.impl.ResourceImpl;
-import com.hp.hpl.jena.rdf.model.impl.Util;
-import com.hp.hpl.jena.shared.BadBooleanException;
-import com.hp.hpl.jena.shared.BadURIException;
-import com.hp.hpl.jena.shared.BrokenException;
-import com.hp.hpl.jena.shared.InvalidPropertyURIException;
-import com.hp.hpl.jena.shared.JenaException;
-import com.hp.hpl.jena.shared.PrefixMapping;
-import com.hp.hpl.jena.util.CharEncoding;
-import com.hp.hpl.jena.util.FileUtils;
+import java.io.OutputStream ;
+import java.io.OutputStreamWriter ;
+import java.io.PrintWriter ;
+import java.io.Writer ;
+import java.util.* ;
+import java.util.Map.Entry ;
+import java.util.regex.Pattern ;
+
+import org.apache.jena.iri.IRI ;
+import org.apache.jena.iri.IRIFactory ;
+import org.apache.xerces.util.XMLChar ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
+
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.rdf.model.* ;
+import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler ;
+import com.hp.hpl.jena.rdf.model.impl.ResourceImpl ;
+import com.hp.hpl.jena.rdf.model.impl.Util ;
+import com.hp.hpl.jena.shared.* ;
+import com.hp.hpl.jena.util.CharEncoding ;
+import com.hp.hpl.jena.util.FileUtils ;
+import com.hp.hpl.jena.vocabulary.* ;
+import com.hp.hpl.jena.xmloutput.RDFXMLWriterI ;
//import com.hp.hpl.jena.vocabulary.DAML_OIL;
-import com.hp.hpl.jena.vocabulary.DC;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.vocabulary.RDFSyntax;
-import com.hp.hpl.jena.vocabulary.RSS;
-import com.hp.hpl.jena.vocabulary.VCARD;
-import com.hp.hpl.jena.xmloutput.RDFXMLWriterI;
/**
* This is not part of the public API.
@@ -478,10 +456,9 @@ abstract public class BaseXMLWriter impl
* null</code> means use only absolute URI's.
*/
@Override
- synchronized public void write(Model baseModel, Writer out, String base)
+ synchronized public void write(Model model, Writer out, String base)
{
- Model model = ModelFactory.withHiddenStatements( baseModel );
- setupNamespaces( baseModel, model );
+ setupNamespaces( model );
PrintWriter pw = out instanceof PrintWriter ? (PrintWriter) out : new PrintWriter( out );
if (!Boolean.FALSE.equals(showXmlDeclaration)) writeXMLDeclaration( out, pw );
writeXMLBody( model, pw, base );
@@ -492,12 +469,12 @@ abstract public class BaseXMLWriter impl
@param baseModel
@param model
*/
- private void setupNamespaces( Model baseModel, Model model )
+ private void setupNamespaces( Model model )
{
this.namespacesNeeded = new HashSet<String>();
this.ns = null;
- this.modelPrefixMapping = baseModel;
- primeNamespace( baseModel );
+ this.modelPrefixMapping = model;
+ primeNamespace( model );
addNameSpace( RDF.getURI() );
addNameSpaces(model);
jenaPrefixCount = 0;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java?rev=1427455&r1=1427454&r2=1427455&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestPackage.java Tue Jan 1 16:17:43 2013
@@ -43,7 +43,6 @@ public class TestPackage extends TestSui
addTest( "TestContains", TestContains.suite() );
addTest( "TestLiteralImpl", TestLiteralImpl.suite() );
addTest( "TestResourceImpl", TestResourceImpl.suite() );
- addTest( "TestHiddenStatements", TestHiddenStatements.suite() );
addTest( "TestNamespace", TestNamespace.suite() );
addTest( "TestModelBulkUpdate", TestModelBulkUpdate.suite() );
addTest( "TestConcurrency", TestConcurrency.suite() ) ;