Author: andy
Date: Tue Jun 24 09:22:00 2014
New Revision: 1605037

URL: http://svn.apache.org/r1605037
Log:
JENA-726 : Remove deprecated reification style ans methods (patch 
remove-deprecated-reification.patch)




Removed:
    
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/exceptions/UnknownStyleException.java
    
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/shared/ReificationStyle.java
Modified:
    
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java
    
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java
    
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/Model.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.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/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java
 (original)
+++ 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/assembler/assemblers/ModelAssembler.java
 Tue Jun 24 09:22:00 2014
@@ -58,21 +58,6 @@ public abstract class ModelAssembler ext
             c.fill( m );
         }
     
-//    public static ReificationStyle getReificationStyle( Resource root )
-//        {
-//        Resource r = getUniqueResource( root, JA.reificationMode );
-//        return r == null ? ReificationStyle.Standard : styleFor( root, r );
-//        }
-//    
-//    @SuppressWarnings("deprecation")
-//    public static ReificationStyle styleFor( Resource root, Resource r )
-//        {
-//        if (r.equals( JA.minimal )) return ReificationStyle.Minimal;
-//        if (r.equals( JA.standard )) return ReificationStyle.Standard;
-//        if (r.equals( JA.convenient )) return ReificationStyle.Convenient;
-//        throw new UnknownStyleException( root, r );
-//        }
-
     private PrefixMapping getPrefixMapping( Assembler a, Resource root )
         {
         return PrefixMappingAssembler.getPrefixes

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java 
(original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/Factory.java Tue 
Jun 24 09:22:00 2014
@@ -31,7 +31,7 @@ public class Factory
         { super(); }
     
     /**
-        Answer a memory-based Graph with the Standard reification style.
+        Answer a memory-based Graph.
     */
     public static Graph createDefaultGraph()
         { return Factory.createGraphMem( ); }

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java 
(original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/GraphMaker.java 
Tue Jun 24 09:22:00 2014
@@ -25,21 +25,11 @@ import com.hp.hpl.jena.util.iterator.*;
     A factory for providing instances of named graphs with appropriate storage 
models.
     It represents a directory, or a database, or a mapping: names map to 
graphs for the
     lifetime of the GraphMaker. Names can be "arbitrary" character sequences.
-<p>
-    A GraphMaker has a reification style which is shared by all the graphs it 
creates.
 */
 
 public interface GraphMaker 
 {
     /**
-        Answer the reification style of all the graphs that this GraphMaker 
constructs.
-        @return the reification style given to all created graphs
-        @deprecated Only style "Standard" is supported.
-    */
-    @Deprecated
-    public ReificationStyle getReificationStyle();
-    
-    /**
         Answer the default graph of this GraphMaker. The same graph is 
returned on
         each call. It may only be constructed on the first call of getGraph(), 
or at any
         previous time.

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java
 (original)
+++ 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/BaseGraphMaker.java
 Tue Jun 24 09:22:00 2014
@@ -35,14 +35,6 @@ public abstract class BaseGraphMaker imp
     private int counter = 0;
     
     /**
-        Answer our reification style.
-    */
-    @Override
-    @Deprecated
-    public ReificationStyle getReificationStyle()
-        { return ReificationStyle.Standard ; }
-        
-    /**
         Answer the default graph for this maker. If we haven't already made 
it, make it
         now.
      */

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java 
(original)
+++ 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java 
Tue Jun 24 09:22:00 2014
@@ -74,7 +74,6 @@ public class FileGraph extends GraphMem
        @param f the File naming the associated file-system file
        @param create true to create a new one, false to read an existing one
         @param strict true to throw exceptions for create: existing, open: not 
found
-        @param style the reification style for the graph
     */
     public FileGraph( NotifyOnClose notify, File f, boolean create, boolean 
strict )
         { this( notify, f, FileUtils.guessLang( f.toString() ), create, strict 
); }
@@ -89,7 +88,6 @@ public class FileGraph extends GraphMem
         @param lang the language string for the file
         @param create true to create a new one, false to read an existing one
         @param strict true to throw exceptions for create: existing, open: not 
found
-        @param style the reification style for the graph
     */
     public FileGraph( NotifyOnClose notify, File f, String lang, boolean 
create, boolean strict )
         {

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java
 (original)
+++ 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraphMaker.java
 Tue Jun 24 09:22:00 2014
@@ -50,25 +50,12 @@ public class FileGraphMaker 
      */
     public FileGraphMaker( String root )
     { this ( root, false ) ; }
-//        { this( root, ReificationStyle.Minimal ); }
-//        
-//    /**
-//        Construct a file graph factory whose files will appear in root. The 
files 
-//        will be retained when the maker is closed.
-//    
-//        @param root the directory to keep the files in.
-//        @param style the reification style of the resulting graph
-//     */
-//    public FileGraphMaker( String root, ReificationStyle style )
-//        { this( root, style, false ); }
- 
     /**
         Construct a file graph factory whose files will appear in root.
         If deleteOnClose is true, the files created by this factory will be 
deleted
         when the factory is closed.
         
        @param root the directory to keep the files in
-        @param style the reification style of the graph
        @param deleteOnClose iff true, delete created files on close
      */
     public FileGraphMaker( String root, boolean deleteOnClose )

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/Model.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/Model.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/Model.java 
(original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/Model.java Tue 
Jun 24 09:22:00 2014
@@ -355,17 +355,6 @@ public interface Model
         */
        Model add(Model m) ;
 
-    /**
-        Add all the statements of the given model m to this model.
-        Optionally supress the addition of reified statements.
-        @param m the model containing the statements to add
-        @param suppressReifications true to suppress adding reified statements
-        @return this model for cascading
-        @deprecated suppressReifications no longer has any effect.
-    */
-       @Deprecated
-    Model add( Model m, boolean suppressReifications );
-
        /** Add the RDF statements from a document.
         *  Uses content negotiation to request appropriate mime types.
         *  If the content type is not found, it may guess from the URL.
@@ -825,14 +814,6 @@ public interface Model
     */
     RSIterator listReifiedStatements( Statement st );
 
-    /**
-        Answer the reification style of the model.
-       @return the reification style
-       createMemModelMaker()
-    */
-    @Deprecated
-    ReificationStyle getReificationStyle();
-
        /** Create a new model containing the statements matching a query.
         *
         * <p>A statment is considered to match if the <CODE>test</CODE> method

Modified: 
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java 
(original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ModelCon.java 
Tue Jun 24 09:22:00 2014
@@ -608,17 +608,6 @@ public interface ModelCon {
  */ 
     Model remove(Model m) ;
     
-    /**
-        Remove from this model all the statements found in the given model.
-        If suppressreifications is true, remove the reified statements of m as 
well.
-        @param m the model containing the statements to remove
-        @param suppressReifications true to remove reified statements too
-        @return this model for cascading
-        @deprecated suppressReifications now longer has any meaning or effect
-    */
-    @Deprecated
-    Model remove( Model m, boolean suppressReifications );
-
     /** 
         Answer a statement iterator that will iterate over all the statements
         (S, P, O) in this model where S matches <code>subject</code>, P

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=1605037&r1=1605036&r2=1605037&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 Jun 24 09:22:00 2014
@@ -38,14 +38,12 @@ import com.hp.hpl.jena.reasoner.InfGraph
 import com.hp.hpl.jena.reasoner.Reasoner ;
 import com.hp.hpl.jena.reasoner.ReasonerRegistry ;
 import com.hp.hpl.jena.shared.PrefixMapping ;
-import com.hp.hpl.jena.shared.ReificationStyle ;
 
 /**
     ModelFactory provides methods for creating standard kinds of Model.
     (ModelFactoryBase is helper functions for it).
 */
 
-@SuppressWarnings("deprecation")
 public class ModelFactory extends ModelFactoryBase
 {
     /**
@@ -55,30 +53,6 @@ public class ModelFactory extends ModelF
         {}
 
     /**
-        The standard reification style; quadlets contribute to reified 
statements,
-        and are visible to listStatements().
-        @deprecated All models are ReificationStyle.Standard by default and 
there is no other supported style.
-    */
-    @Deprecated
-    public static final ReificationStyle Standard = ReificationStyle.Standard;
-
-    /**
-        The convenient reification style; quadlets contribute to reified 
statements,
-        but are invisible to listStatements().
-        @deprecated All models are ReificationStyle.Standard by default and 
there is no other supported style.
-    */
-    @Deprecated
-    public static final ReificationStyle Convenient = 
ReificationStyle.Convenient;
-
-    /**
-        The minimal reification style; quadlets do not contribute to reified 
statements,
-        and are visible to listStatements().
-        @deprecated All models are ReificationStyle.Standard by default and 
there is no other supported style.
-    */
-    @Deprecated
-    public static final ReificationStyle Minimal = ReificationStyle.Minimal;
-
-    /**
         Each Model created by ModelFactory has a default set of prefix 
mappings.
         These mappings are copied from a (static) default PrefixMapping which 
is
         set by setDefaultModelPrefixes. It is the reference to a PrefixMapping 
that
@@ -140,33 +114,6 @@ public class ModelFactory extends ModelF
         { return new ModelCom( Factory.createGraphMem( ) ); }
 
     /**
-        Answer a new memory-based model with the given reification style
-        @deprecated     Hidden partial reifications not supported -- only 
style "Standard" 
-    */
-    @Deprecated 
-    public static Model createDefaultModel( ReificationStyle style )
-        { return new ModelCom( Factory.createGraphMem( ) ); }
-
-    /**
-        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 m ; }
-
-    /**
-        construct a new memory-based model that does not capture reification 
triples
-        (but still handles reifyAs() and .as(ReifiedStatement).
-        @deprecated All models are ReificationStyle.Standard by default and 
there is no other supported style.
-    */
-    @Deprecated
-    public static Model createNonreifyingModel()
-        { return createDefaultModel( ); }
-
-    /**
         Answer a model that encapsulates the given graph. Existing prefixes are
         undisturbed.
         @param g A graph structure
@@ -188,19 +135,6 @@ public class ModelFactory extends ModelF
         { return new ModelMakerImpl( new FileGraphMaker( root ) ); }
 
     /**
-        Answer a ModelMaker that constructs memory-based Models that
-        are backed by files in the root directory. The Model is loaded from the
-        file when it is opened, and when the Model is closed it is written 
back.
-
-        @param root the name of the directory in which the backing files are 
held
-        @param style the desired reification style
-        @return a ModelMaker linked to the files in the root
-    */
-    @Deprecated
-    public static ModelMaker createFileModelMaker( String root, 
ReificationStyle style )
-        { return new ModelMakerImpl( new FileGraphMaker( root ) ); }
-
-    /**
         Answer a ModelMaker that constructs memory-based Models that do
         not persist past JVM termination.
 
@@ -210,18 +144,6 @@ public class ModelFactory extends ModelF
         { return new ModelMakerImpl( new SimpleGraphMaker( ) );  }
 
     /**
-        Answer a ModelMaker that constructs memory-based Models that do
-        not persist past JVM termination, with the given reification style.
-
-        @param style the reification style for the model
-        @return a ModelMaker that constructs memory-based models
-        @deprecated     Hidden partial reifications not support -- only style 
"Standard" 
-    */
-    @Deprecated 
-    public static ModelMaker createMemModelMaker( ReificationStyle style )
-    { return createMemModelMaker() ; }
-
-    /**
      * Return a Model through which all the RDFS entailments
      * derivable from the given model are accessible. Some work is done
      * when the inferenced model is created but each query will also trigger 
some

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=1605037&r1=1605036&r2=1605037&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 Jun 24 09:22:00 2014
@@ -198,15 +198,9 @@ implements Model, PrefixMapping, Lock
     }
 
     @Override
-    public Model add( Model m )  
-    { return add( m, false ); }
-
-    @Deprecated
-    @Override
-    public Model add( Model m, boolean suppressReifications ) {
-        // suppressReifications is a no-op.
-        GraphUtil.addInto( getGraph(), m.getGraph() );
-        return this;
+    public Model add(Model m) {
+        GraphUtil.addInto(getGraph(), m.getGraph()) ;
+        return this ;
     }
 
     @Override
@@ -384,11 +378,6 @@ implements Model, PrefixMapping, Lock
 
     @Override
     public Model remove( Model m )
-    { return remove( m, false ); }
-
-    @Override
-    @Deprecated
-    public Model remove( Model m, boolean suppressReifications ) 
     {
         GraphUtil.deleteFrom( getGraph(), m.getGraph());
         return this;
@@ -1163,11 +1152,6 @@ implements Model, PrefixMapping, Lock
         return this;
     }
 
-    @Override
-    @Deprecated
-    public ReificationStyle getReificationStyle()
-    { return modelReifier.getReificationStyle(); }
-
     /**
         @return an iterator which delivers all the ReifiedStatements in this 
model
      */
@@ -1525,7 +1509,7 @@ implements Model, PrefixMapping, Lock
           { return "<ModelCom  " + getGraph() + " | " + reifiedToString() + 
">"; }
 
           public String reifiedToString()
-          { return statementsToString( getHiddenStatements().listStatements() 
); }
+          { return statementsToString( listStatements() ); }
 
           protected String statementsToString( StmtIterator it )
           {
@@ -1533,19 +1517,9 @@ implements Model, PrefixMapping, Lock
               while (it.hasNext()) b.append( " " ).append( it.nextStatement() 
);
               return b.toString();
           }
-          /**
-               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 this ; }
 
           /**
-        Answer whether or not these two graphs are isomorphic, taking the
-        hidden (reification) statements into account.
+            Answer whether or not these two graphs are isomorphic.
            */
           @Override
           public boolean isIsomorphicWith( Model m )

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=1605037&r1=1605036&r2=1605037&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 Jun 24 09:22:00 2014
@@ -23,7 +23,6 @@ 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 ;
 
@@ -31,7 +30,6 @@ import com.hp.hpl.jena.util.iterator.Map
     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;
@@ -51,35 +49,8 @@ public class ModelReifier
         {
         this.model = model; 
         }
-        
-    @Deprecated
-    public ReificationStyle getReificationStyle()
-        { return ReificationStyle.Standard ; }
-        
-    /**
-        Answer a version of the model, but with all its reifiying statements
-        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 )
-    {
-        // 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 model ; } 
-        
-    /**
         Answer a fresh reification of a statement associated with a fresh 
bnode.
         @param s a Statement to reifiy
         @return a reified statement object who's name is a new bnode

Modified: 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java?rev=1605037&r1=1605036&r2=1605037&view=diff
==============================================================================
--- 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
 (original)
+++ 
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelMakerImpl.java
 Tue Jun 24 09:22:00 2014
@@ -18,28 +18,26 @@
 
 package com.hp.hpl.jena.rdf.model.test;
 
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.GraphMaker;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.test.GraphTestBase;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelMaker;
-import com.hp.hpl.jena.rdf.model.impl.ModelMakerImpl;
-import com.hp.hpl.jena.shared.ReificationStyle;
-import com.hp.hpl.jena.test.JenaTestBase;
-import com.hp.hpl.jena.util.iterator.ExtendedIterator;
-import com.hp.hpl.jena.util.iterator.NullIterator;
+import java.util.ArrayList ;
+import java.util.List ;
 
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.TestCase ;
+import org.junit.Assert ;
 
-import org.junit.Assert;
-import junit.framework.TestCase;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.GraphMaker ;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.test.GraphTestBase ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelMaker ;
+import com.hp.hpl.jena.rdf.model.impl.ModelMakerImpl ;
+import com.hp.hpl.jena.test.JenaTestBase ;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator ;
+import com.hp.hpl.jena.util.iterator.NullIterator ;
 
 /**
  * Test ModelMakerImpl using a mock GraphMaker.
  */
-@SuppressWarnings("deprecation")
 public class TestModelMakerImpl extends TestCase
 {
        static class MockGraphMaker implements GraphMaker
@@ -105,14 +103,6 @@ public class TestModelMakerImpl extends 
                }
 
                @Override
-               @Deprecated
-               public ReificationStyle getReificationStyle()
-               {
-                       history.add("getReificationStyle()");
-                       return null;
-               }
-
-               @Override
                public boolean hasGraph( final String name )
                {
                        history.add("has(" + name + ")");


Reply via email to