jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1611973 - in /jena/trunk/jena-core/src: main/java/com/hp/hpl/jena/n3/ main/java/com/hp/hpl/jena/n3/turtle/ test/java/com/hp/hpl/jena/n3/ test/java/com/hp/hpl/jena/rdf/model/test/ test/java/com/hp/hpl/jena/util/junit/
Date Sat, 19 Jul 2014 21:54:34 GMT
Author: andy
Date: Sat Jul 19 21:54:34 2014
New Revision: 1611973

URL: http://svn.apache.org/r1611973
Log:
JENA-747 : Deprecate N3 IRIResolver

Modified:
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/IRIResolver.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java
    jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/turtle/ParserBase.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TestResolver.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
    jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/junit/Manifest.java

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/IRIResolver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/IRIResolver.java?rev=1611973&r1=1611972&r2=1611973&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/IRIResolver.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/IRIResolver.java Sat Jul 19 21:54:34
2014
@@ -24,8 +24,11 @@ import org.apache.jena.iri.IRIException;
 import org.apache.jena.iri.IRIFactory;
 import com.hp.hpl.jena.util.FileUtils;
 
-/** A simple class to access IRI resolution */
+/** A simple class to access IRI resolution.
+ * Replaced by {@code org.apache.jena.riot.system.IRIResolver}
+ */
 
+@Deprecated
 public class IRIResolver {
 	/**
 	 * The current working directory, as a string.

Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java?rev=1611973&r1=1611972&r2=1611973&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java Sat Jul 19 21:54:34
2014
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.n3;
 
 import com.hp.hpl.jena.graph.GraphEvents;
 import com.hp.hpl.jena.rdf.model.*;
+
 import java.net.* ;
 import java.io.* ;
 
@@ -31,7 +32,7 @@ import com.hp.hpl.jena.util.FileUtils;
 /** Abstract class that sorts out input streams, readers and base URIs, to call a
  * single worker function with model, UTF8 reader and visated base  
  */
-
+@SuppressWarnings("deprecation")
 public abstract class JenaReaderBase implements RDFReader
 {
 	protected RDFErrorHandler errorHandler = null ;

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=1611973&r1=1611972&r2=1611973&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 Sat Jul 19
21:54:34 2014
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.shared.PrefixMapp
 import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
 import com.hp.hpl.jena.vocabulary.RDF ;
 
+@SuppressWarnings("deprecation")
 public class ParserBase
 {
     // Should be the same as ARQ ParserBase and Prologues.

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TestResolver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TestResolver.java?rev=1611973&r1=1611972&r2=1611973&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TestResolver.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/TestResolver.java Sat Jul 19 21:54:34
2014
@@ -23,7 +23,7 @@ import junit.framework.TestSuite;
 
 import com.hp.hpl.jena.n3.IRIResolver;
 import com.hp.hpl.jena.n3.JenaURIException;
-
+@SuppressWarnings("deprecation")
 public class TestResolver extends TestCase
 {
     public static TestSuite suite()

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java?rev=1611973&r1=1611972&r2=1611973&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/model/test/TestModelRead.java Sat
Jul 19 21:54:34 2014
@@ -23,7 +23,6 @@ import org.junit.Assert ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
-import com.hp.hpl.jena.n3.IRIResolver ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.ModelFactory ;
 import com.hp.hpl.jena.rdf.model.test.helpers.ModelHelper ;
@@ -78,10 +77,10 @@ public class TestModelRead extends Abstr
         ModelHelper.assertIsoModels(ModelHelper.modelWithStatements(this, "http://example/
ja:predicate ja:object"),
                                     mBasedExplicit) ;
     }
-
+    @SuppressWarnings("deprecation")
     public void testSimpleLoadImplictBase() throws IRIException {
         final Model mBasedImplicit = createModel() ;
-        final String fn = IRIResolver.resolveFileURL(getFileName("modelReading/based.n3"))
;
+        final String fn = com.hp.hpl.jena.n3.IRIResolver.resolveFileURL(getFileName("modelReading/based.n3"))
;
         final Model wanted = createModel().add(ModelHelper.resource(fn), ModelHelper.property("ja:predicate"),
                                                ModelHelper.resource("ja:object")) ;
         mBasedImplicit.read(fn, "N3") ;

Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/junit/Manifest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/junit/Manifest.java?rev=1611973&r1=1611972&r2=1611973&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/junit/Manifest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/util/junit/Manifest.java Sat Jul 19
21:54:34 2014
@@ -25,7 +25,6 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.hp.hpl.jena.n3.IRIResolver; 
 import com.hp.hpl.jena.rdf.model.*;
 //import com.hp.hpl.jena.sparql.vocabulary.TestManifest;
 //import com.hp.hpl.jena.sparql.vocabulary.TestManifestX;
@@ -48,11 +47,13 @@ public class Manifest
     String filename ;
     List<String> includedFiles = new ArrayList<>() ;
     Resource manifestRes = null ;
-     
+
+    
+    @SuppressWarnings("deprecation")
     public Manifest(String fn)
     {
         log.debug("Manifest = "+fn ) ;
-        filename = IRIResolver.resolveGlobal(fn) ;
+        filename = com.hp.hpl.jena.n3.IRIResolver.resolveGlobal(fn) ;
         log.debug("         = "+filename ) ;
         manifest = FileManager.get().loadModel(filename) ;
         parseIncludes() ;



Mime
View raw message