jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1426031 - in /jena/trunk/jena-arq/src: main/java/org/apache/jena/riot/ main/java/org/apache/jena/riot/adapters/ main/java/org/apache/jena/riot/stream/ test/java/org/apache/jena/riot/stream/
Date Wed, 26 Dec 2012 21:26:44 GMT
Author: andy
Date: Wed Dec 26 21:26:43 2012
New Revision: 1426031

URL: http://svn.apache.org/viewvc?rev=1426031&view=rev
Log:
Rename alternative classes to their real names.

Added:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java
      - copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java
      - copied, changed from r1423683, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java
      - copied, changed from r1423683, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
Removed:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java
Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/FileManagerModelCache.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java Wed Dec 26 21:26:43
2012
@@ -73,7 +73,7 @@ public class RDFDataMgr
     
     static Logger log = LoggerFactory.getLogger(RDFDataMgr.class) ;
     private static String riotBase = "http://jena.apache.org/riot/" ; 
-    private static String streamManagerSymbolStr = riotBase+"streammanager" ; 
+    private static String streamManagerSymbolStr = riotBase+"streamManager" ; 
     public static Symbol streamManagerSymbol = Symbol.create(streamManagerSymbolStr) ; 
     
     /** Read triples into a Model from the given location. 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
Wed Dec 26 21:26:43 2012
@@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.shared.NotFoundException ;
 import com.hp.hpl.jena.util.FileUtils ;
-import com.hp.hpl.jena.util.LocationMapper ;
 import com.hp.hpl.jena.util.TypedStream ;
 
 /** FileManager
@@ -44,8 +43,8 @@ import com.hp.hpl.jena.util.TypedStream 
  * resources: applications may also create specialised FileManagers.
  * 
  * A FileManager contains a list of location functions to try: the global
- * FileManger has one {@link LocatorFile2}, one {@link LocatorClassLoader} and
- * one {@link LocatorURL2}
+ * FileManger has one {@link LocatorFile}, one {@link LocatorClassLoader} and
+ * one {@link LocatorURL}
  * 
  * Main operations:
  * <ul>
@@ -65,7 +64,7 @@ import com.hp.hpl.jena.util.TypedStream 
  * copy of a common RDF dataset may be used whenever the usual URL is used by
  * the application.
  *
- * The {@link LocatorFile2} also supports the idea of "current directory".
+ * The {@link LocatorFile} also supports the idea of "current directory".
  * 
  * @see StreamManager
  * @see LocationMapper
@@ -134,17 +133,17 @@ public class AdapterFileManager extends 
         while ( iter.hasNext() )
             streamManager.addLocator(AdapterLib.convert(iter.next())) ;
 
-        LocationMapper locmap = filemanager.getLocationMapper() ;
+        com.hp.hpl.jena.util.LocationMapper locmap = filemanager.getLocationMapper() ;
         streamManager.setLocationMapper(AdapterLib.copyConvert(locmap)) ;
     }
 
     public AdapterFileManager(StreamManager streamManager)
     {
-        this(streamManager, (LocationMapper2)null) ;
+        this(streamManager, (LocationMapper)null) ;
     }
     
     /** Create a FileManger using a RIOT StreamManager and RIOT LocationMapper  */
-    public AdapterFileManager(StreamManager streamManager, LocationMapper2 mapper)
+    public AdapterFileManager(StreamManager streamManager, LocationMapper mapper)
     { 
         if ( streamManager == null )
             streamManager = new StreamManager() ;
@@ -155,7 +154,7 @@ public class AdapterFileManager extends 
     /** Create a "standard" FileManager. */
     public static AdapterFileManager makeGlobal()
     {
-        AdapterFileManager fMgr = new AdapterFileManager(StreamManager.get(), (LocationMapper2)null)
;
+        AdapterFileManager fMgr = new AdapterFileManager(StreamManager.get(), (LocationMapper)null)
;
         return fMgr ;
     }
     
@@ -164,11 +163,11 @@ public class AdapterFileManager extends 
     
     /** Set the location mapping */
     @Override
-    public void setLocationMapper(LocationMapper mapper)   { streamManager.setLocationMapper(AdapterLib.copyConvert(mapper))
; }
+    public void setLocationMapper(com.hp.hpl.jena.util.LocationMapper mapper)   { streamManager.setLocationMapper(AdapterLib.copyConvert(mapper))
; }
     
     /** Get the location mapping */
     @Override
-    public LocationMapper getLocationMapper()               { return new AdapterLocationMapper(streamManager.getLocationMapper())
; }
+    public com.hp.hpl.jena.util.LocationMapper getLocationMapper()               { return
new AdapterLocationMapper(streamManager.getLocationMapper()) ; }
     
     /** Return an iterator over all the handlers */
     @Override
@@ -194,7 +193,7 @@ public class AdapterFileManager extends 
     @Override
     public void addLocatorFile(String dir)
     {
-        LocatorFile2 fLoc = new LocatorFile2(dir) ;
+        LocatorFile fLoc = new LocatorFile(dir) ;
         streamManager.addLocator(fLoc) ;
     }
     
@@ -210,7 +209,7 @@ public class AdapterFileManager extends 
     @Override
     public void addLocatorURL()
     {
-        Locator loc = new LocatorURL2() ;
+        Locator loc = new LocatorURL() ;
         streamManager.addLocator(loc) ;
     }
 

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java Wed Dec
26 21:26:43 2012
@@ -35,9 +35,9 @@ class AdapterLib
     }
     
     
-    public static LocationMapper2 copyConvert(com.hp.hpl.jena.util.LocationMapper locMap)
+    public static LocationMapper copyConvert(com.hp.hpl.jena.util.LocationMapper locMap)
     {
-        LocationMapper2 lmap2 = new LocationMapper2() ;
+        LocationMapper lmap2 = new LocationMapper() ;
         if ( locMap == null )
             return null ;
         
@@ -63,7 +63,7 @@ class AdapterLib
         if ( oldloc instanceof com.hp.hpl.jena.util.LocatorFile )
         {
             com.hp.hpl.jena.util.LocatorFile lFile = (com.hp.hpl.jena.util.LocatorFile)oldloc
;
-            return new LocatorFile2(lFile.getDir()) ;
+            return new LocatorFile(lFile.getDir()) ;
         }
         if ( oldloc instanceof com.hp.hpl.jena.util.LocatorClassLoader )
         {
@@ -71,7 +71,7 @@ class AdapterLib
             return new LocatorClassLoader(classLoc.getClassLoader()) ;
         }
         if ( oldloc instanceof com.hp.hpl.jena.util.LocatorURL )
-            return new LocatorURL2() ;
+            return new LocatorURL() ;
         if ( oldloc instanceof com.hp.hpl.jena.util.LocatorZip )
         {
             com.hp.hpl.jena.util.LocatorZip zipLoc = (com.hp.hpl.jena.util.LocatorZip)oldloc
;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
Wed Dec 26 21:26:43 2012
@@ -20,16 +20,16 @@ package org.apache.jena.riot.adapters;
 
 import java.util.Iterator ;
 
-import org.apache.jena.riot.stream.LocationMapper2 ;
+import org.apache.jena.riot.stream.LocationMapper ;
 
 import com.hp.hpl.jena.rdf.model.Model ;
 
 /** Adapter from Jena2 LocationMapper to RIOT LocationMapper */ 
 public class AdapterLocationMapper extends com.hp.hpl.jena.util.LocationMapper 
 {
-    private final LocationMapper2 mapper ;
+    private final LocationMapper mapper ;
 
-    public AdapterLocationMapper(LocationMapper2 mapper) {  this.mapper = mapper ; }
+    public AdapterLocationMapper(LocationMapper mapper) {  this.mapper = mapper ; }
     
     @Override
     public String altMapping(String uri, String otherwise)  { return mapper.altMapping(uri,
otherwise) ; }

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/FileManagerModelCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/FileManagerModelCache.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/FileManagerModelCache.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/FileManagerModelCache.java
Wed Dec 26 21:26:43 2012
@@ -25,6 +25,9 @@ import com.hp.hpl.jena.rdf.model.Model ;
 
 // Legacy support.
 class FileManagerModelCache {
+    
+    public FileManagerModelCache() {}
+    
     boolean cacheModelLoads = false ;
     Map<String, Model> modelCache = null ;
     // -------- Cache operations

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java Wed
Dec 26 21:26:43 2012
@@ -36,13 +36,13 @@ import com.hp.hpl.jena.vocabulary.Locati
  */
 class JenaIOEnvironment
 {
-    static LocationMapper2 theMapper = null ;
+    static LocationMapper theMapper = null ;
     /** Get the global LocationMapper */
-    public static LocationMapper2 getLocationMapper()
+    public static LocationMapper getLocationMapper()
     {
         if ( theMapper == null )
         {
-            theMapper = new LocationMapper2() ;
+            theMapper = new LocationMapper() ;
             if ( getGlobalConfigPath() != null )
                 JenaIOEnvironment.createLocationMapper(getGlobalConfigPath()) ;
         }
@@ -76,27 +76,27 @@ class JenaIOEnvironment
      * If called before any call to get(), then the usual default global location mapper
is not created 
      * @param globalLocationMapper
      */
-    public static void setGlobalLocationMapper(LocationMapper2 globalLocationMapper)
+    public static void setGlobalLocationMapper(LocationMapper globalLocationMapper)
     {
         theMapper = globalLocationMapper ;
     }
 
     /** Make a location mapper from the path settings */ 
-    static public LocationMapper2 makeGlobal()
+    static public LocationMapper makeGlobal()
     {
-        LocationMapper2 lMap = new LocationMapper2() ;
+        LocationMapper lMap = new LocationMapper() ;
         if ( getGlobalConfigPath() != null )
         {
-            LocationMapper2 lMap2 = JenaIOEnvironment.createLocationMapper(getGlobalConfigPath())
;
+            LocationMapper lMap2 = JenaIOEnvironment.createLocationMapper(getGlobalConfigPath())
;
             lMap.copyFrom(lMap2) ;
         }
         return lMap ;
     }
   
     /** Create a LocationMapper based on Model */
-    public static LocationMapper2 processConfig(Model m)
+    public static LocationMapper processConfig(Model m)
     {
-        LocationMapper2 locMap = new LocationMapper2() ; 
+        LocationMapper locMap = new LocationMapper() ; 
         StmtIterator mappings =
             m.listStatements(null, LocationMappingVocab.mapping, (RDFNode)null) ;
     
@@ -146,11 +146,11 @@ class JenaIOEnvironment
      *  to find a description of a LocationMapper, then create and return a
      *  LocationMapper based on the description.
      */
-    public static LocationMapper2 createLocationMapper(String configPath)
+    public static LocationMapper createLocationMapper(String configPath)
     {
         // Old code : maintenance: use Webreader to open the model. 
         
-        LocationMapper2 locMap = new LocationMapper2() ;
+        LocationMapper locMap = new LocationMapper() ;
         if ( configPath == null || configPath.length() == 0 )
         {
             log.warn("Null configuration") ;
@@ -159,7 +159,7 @@ class JenaIOEnvironment
         
         // Make a file manager to look for the location mapping file
         StreamManager smgr = new StreamManager() ;
-        smgr.addLocator(new LocatorFile2()) ;
+        smgr.addLocator(new LocatorFile()) ;
         smgr.addLocator(new LocatorClassLoader(smgr.getClass().getClassLoader())) ;
         
         try {
@@ -191,7 +191,7 @@ class JenaIOEnvironment
             processConfig(model) ;
         } catch (JenaException ex)
         {
-            LoggerFactory.getLogger(LocationMapper2.class).warn("Error in configuration file:
"+ex.getMessage()) ;
+            LoggerFactory.getLogger(LocationMapper.class).warn("Error in configuration file:
"+ex.getMessage()) ;
         }
         return locMap ;
     }

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java
(from r1422690, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper2.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper2.java&r1=1422690&r2=1426031&rev=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocationMapper.java Wed
Dec 26 21:26:43 2012
@@ -42,46 +42,24 @@ import com.hp.hpl.jena.vocabulary.Locati
  * There is a default LocationMapper which is used by the global @link{FileManager}.
  */
 
-public class LocationMapper2
+public class LocationMapper
 {
-    static Logger log = LoggerFactory.getLogger(LocationMapper2.class)  ;
+    static Logger log = LoggerFactory.getLogger(LocationMapper.class)  ;
     Map<String, String> altLocations = new HashMap<String, String>() ;
     Map<String, String> altPrefixes = new HashMap<String, String>() ;
     
     /** Create a LocationMapper with no mapping yet */
-    public LocationMapper2() { }
+    public LocationMapper() { }
     
     /** Create a LocationMapper made like another one
      * This is a deep copy of the location and prefix maps..*/
-    public LocationMapper2(LocationMapper2 locMapper)
+    public LocationMapper(LocationMapper locMapper)
     {
         altLocations.putAll(locMapper.altLocations) ;
         altPrefixes.putAll(locMapper.altPrefixes) ;
     }
     
-    // Moved to Jena IO environment setup.
-//    /** Create a LocationMapper from an existing model
-//     * @see com.hp.hpl.jena.vocabulary.LocationMappingVocab
-//     */
-//    public LocationMapper(Model model)
-//    {
-//        LocationMapper lm = JenaIOEnvironment.processConfig(model) ;
-//        if ( lm == null )
-//            throw new AtlasException("Model does not provide a location mapping") ;
-//        copyFrom(lm) ;
-//         
-//    }
-//    
-//    /** Create a LocationMapper from a config file */
-//    public LocationMapper(String config)
-//    {
-//        LocationMapper lm = JenaIOEnvironment.createLocationMapper(config) ;
-//        if ( lm == null )
-//            throw new AtlasException("Config does not provide a location mapping") ;
-//        copyFrom(lm) ;
-//    }
-    
-    public void copyFrom(LocationMapper2 lmap2)
+    public void copyFrom(LocationMapper lmap2)
     {
         this.altLocations.putAll(lmap2.altLocations) ;
         this.altPrefixes.putAll(lmap2.altPrefixes) ;
@@ -172,9 +150,9 @@ public class LocationMapper2
     @Override
     public boolean equals(Object obj)
     {
-        if ( ! ( obj instanceof LocationMapper2 ) )
+        if ( ! ( obj instanceof LocationMapper ) )
             return false ;
-        LocationMapper2 other = (LocationMapper2)obj ;
+        LocationMapper other = (LocationMapper)obj ;
         
         if ( ! this.altLocations.equals(other.altLocations) )
             return false ;

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java (from
r1423683, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java&r1=1423683&r2=1426031&rev=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java Wed Dec
26 21:26:43 2012
@@ -38,20 +38,20 @@ import com.hp.hpl.jena.util.FileUtils ;
  *  location mapping (see @link{LocationMapping}) as it applies only to files.
  */
 
-public class LocatorFile2 implements Locator
+public class LocatorFile implements Locator
 {
-    static Logger log = LoggerFactory.getLogger(LocatorFile2.class) ;
+    static Logger log = LoggerFactory.getLogger(LocatorFile.class) ;
     private final String thisDir ;
     private final String thisDirLogStr ;
 
     /** Create a LocatorFile */
-    public LocatorFile2() { this(null) ; }
+    public LocatorFile() { this(null) ; }
     
     /** Create a LocatorFile that uses the argument as it's working directory
      * The working directory should be a UNIX style file name,
      * (relative or absolute), not a URI.
      */
-    public LocatorFile2(String dir)
+    public LocatorFile(String dir)
     {
         if ( dir != null )
         {
@@ -171,7 +171,7 @@ public class LocatorFile2 implements Loc
         if (this == obj) return true ;
         if (obj == null) return false ;
         if (getClass() != obj.getClass()) return false ;
-        LocatorFile2 other = (LocatorFile2)obj ;
+        LocatorFile other = (LocatorFile)obj ;
         if (thisDir == null)
         {
             if (other.thisDir != null) return false ;

Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java (from
r1423683, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java&r1=1423683&r2=1426031&rev=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorURL.java Wed Dec
26 21:26:43 2012
@@ -25,9 +25,9 @@ import org.slf4j.LoggerFactory ;
 
 import com.hp.hpl.jena.util.FileUtils ;
 
-public class LocatorURL2 implements Locator
+public class LocatorURL implements Locator
 {
-    private static Logger log = LoggerFactory.getLogger(LocatorURL2.class) ;
+    private static Logger log = LoggerFactory.getLogger(LocatorURL.class) ;
     private static final String[] schemeNames = { "http" , "https" } ;    // Must be lower
case and not include the ":"
     
     public final String acceptTriples = "text/turtle,application/rdf+xml;q=0.9,application/xml;q=0.8,*/*;q=0.5"
; 
@@ -81,7 +81,7 @@ public class LocatorURL2 implements Loca
         if (this == obj) return true ;
         if (obj == null) return false ;
         if (getClass() != obj.getClass()) return false ;
-        LocatorURL2 other = (LocatorURL2)obj ;
+        LocatorURL other = (LocatorURL)obj ;
         if (acceptTriples == null)
         {
             if (other.acceptTriples != null) return false ;

Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/StreamManager.java Wed Dec
26 21:26:43 2012
@@ -41,20 +41,20 @@ public class StreamManager
     public static boolean logAllLookups = true ; 
     
     private List<Locator> handlers = new ArrayList<Locator>() ;
-    private LocationMapper2 mapper = null ;
+    private LocationMapper mapper = null ;
     
     private static StreamManager globalStreamManager ;
     
     /** Return a default configuration StreamManager 
-     *  with a {@link LocatorFile2}, 
-     *  {@link LocatorURL2},
+     *  with a {@link LocatorFile}, 
+     *  {@link LocatorURL},
      *  and {@link LocatorClassLoader}
      */
     public static StreamManager makeDefaultStreamManager()
     {
         StreamManager streamManager = new StreamManager() ;
-        streamManager.addLocator(new LocatorFile2(null)) ;
-        streamManager.addLocator(new LocatorURL2()) ;
+        streamManager.addLocator(new LocatorFile(null)) ;
+        streamManager.addLocator(new LocatorURL()) ;
         streamManager.addLocator(new LocatorClassLoader(streamManager.getClass().getClassLoader()))
;
         return streamManager ;
     }
@@ -132,10 +132,10 @@ public class StreamManager
     
 
     /** Set the location mapping */
-    public void setLocationMapper(LocationMapper2 _mapper) { mapper = _mapper ; }
+    public void setLocationMapper(LocationMapper _mapper) { mapper = _mapper ; }
     
     /** Get the location mapping */
-    public LocationMapper2 getLocationMapper() { return mapper ; }
+    public LocationMapper getLocationMapper() { return mapper ; }
     
     /** Return an immutable list of all the handlers */
     public List<Locator> locators() { return Collections.unmodifiableList(handlers)
; }

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java Wed Dec
26 21:26:43 2012
@@ -31,7 +31,7 @@ public class TestLocators extends BaseTe
     
     @Test public void locatorFile_01()
     {
-        LocatorFile2 loc = new LocatorFile2() ;
+        LocatorFile loc = new LocatorFile() ;
         assertTrue(loc.exists("pom.xml")) ;
         assertTrue(loc.exists(testingDir+"data.ttl")) ;
         assertFalse(loc.exists("IDoNotExist")) ;
@@ -39,7 +39,7 @@ public class TestLocators extends BaseTe
     
     @Test public void locatorFile_02()
     {
-        LocatorFile2 loc = new LocatorFile2(".") ;
+        LocatorFile loc = new LocatorFile(".") ;
         assertTrue(loc.exists("pom.xml")) ;
         assertTrue(loc.exists(testingDir+"data.ttl")) ;
         assertFalse(loc.exists("IDoNotExist")) ;
@@ -48,7 +48,7 @@ public class TestLocators extends BaseTe
     @Test public void locatorFile_03()
     {
         String dir = new File(".").getAbsolutePath() ;
-        LocatorFile2 loc = new LocatorFile2(dir) ;
+        LocatorFile loc = new LocatorFile(dir) ;
         assertTrue(loc.exists("pom.xml")) ;
         assertFalse(loc.exists("IDoNotExist")) ;
     }
@@ -56,7 +56,7 @@ public class TestLocators extends BaseTe
     @Test public void locatorFile_04()
     {
         String dir = new File("src").getAbsolutePath() ;
-        LocatorFile2 loc = new LocatorFile2(dir) ;
+        LocatorFile loc = new LocatorFile(dir) ;
         
         assertFalse(loc.exists("pom.xml")) ;
         assertTrue(loc.exists("main")) ;
@@ -67,7 +67,7 @@ public class TestLocators extends BaseTe
     
     @Test public void locatorFile_05()
     {
-        LocatorFile2 loc = new LocatorFile2() ;
+        LocatorFile loc = new LocatorFile() ;
         TypedInputStream ts = loc.open(testingDir+"data.ttl") ;
         assertTrue("Not equal: "+WebContent.contentTypeTurtle+" != "+ts.getMediaType(), 
                    WebContent.contentTypeTurtle.equalsIgnoreCase(ts.getContentType())) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1426031&r1=1426030&r2=1426031&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Wed
Dec 26 21:26:43 2012
@@ -48,9 +48,9 @@ public class TestStreamManager extends B
     { 
         streamMgrStd = StreamManager.get() ;
         streamMgr = new StreamManager() ;
-        streamMgr.addLocator(new LocatorFile2()) ;
-        streamMgr.addLocator(new LocatorFile2(directory)) ;
-        streamMgr.addLocator(new LocatorURL2()) ;
+        streamMgr.addLocator(new LocatorFile()) ;
+        streamMgr.addLocator(new LocatorFile(directory)) ;
+        streamMgr.addLocator(new LocatorURL()) ;
         
         streamManagerContextValue = context.get(RDFDataMgr.streamManagerSymbol) ;
         context.put(RDFDataMgr.streamManagerSymbol, streamMgr) ;



Mime
View raw message