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 2012/09/30 00:47:43 UTC
svn commit: r1391915 - in /jena:
Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/
Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/
Scratch/AFS/Dev/trunk/src-dev/dev/
Author: andy
Date: Sat Sep 29 22:47:43 2012
New Revision: 1391915
URL: http://svn.apache.org/viewvc?rev=1391915&view=rev
Log: (empty)
Removed:
jena/Scratch/AFS/Dev/trunk/src-dev/dev/SizeIndexes.java
Modified:
jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java
jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorZip.java
jena/Scratch/AFS/Dev/trunk/src-dev/dev/BindingN.java
Modified: jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Sat Sep 29 22:47:43 2012
@@ -118,25 +118,24 @@ public class AdapterFileManager extends
}
/** Create an uninitialized FileManager */
- public AdapterFileManager()
- {
- this(new StreamManager(), JenaIOEnvironment.getLocationMapper()) ;
+ private AdapterFileManager()
+ {
+ streamManager = new StreamManager() ;
}
/** Create a new file manager that is a copy of another.
* Location mapper and locators chain are copied (the locators are not cloned).
* @param filemanager
*/
- public AdapterFileManager(AdapterFileManager filemanager)
+ public AdapterFileManager(com.hp.hpl.jena.util.FileManager filemanager)
{
this() ;
- for ( Locator locator : filemanager.streamManager.locators() )
- streamManager.addLocator(locator) ;
+ Iterator<com.hp.hpl.jena.util.Locator> iter = filemanager.locators() ;
+ while ( iter.hasNext() )
+ streamManager.addLocator(AdapterLib.convert(iter.next())) ;
- LocationMapper2 locmap = filemanager.streamManager.getLocationMapper() ;
- if ( locmap != null )
- locmap = new LocationMapper2(locmap) ; // copy
- streamManager.setLocationMapper(locmap) ;
+ LocationMapper locmap = filemanager.getLocationMapper() ;
+ streamManager.setLocationMapper(AdapterLib.copyConvert(locmap)) ;
}
public AdapterFileManager(StreamManager streamManager)
@@ -153,15 +152,6 @@ public class AdapterFileManager extends
streamManager.setLocationMapper(mapper) ;
}
- /** Create with the given location mapper */
- public AdapterFileManager(StreamManager streamManager, LocationMapper mapper)
- {
- if ( streamManager == null )
- streamManager = new StreamManager() ;
- this.streamManager = streamManager ;
- streamManager.setLocationMapper(AdapterLib.copyConvert(mapper)) ;
- }
-
/** Create a "standard" FileManager. */
public static AdapterFileManager makeGlobal()
{
Modified: jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java (original)
+++ jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java Sat Sep 29 22:47:43 2012
@@ -20,9 +20,11 @@ package org.apache.jena.riot.adapters;
import java.util.Iterator ;
+import com.hp.hpl.jena.sparql.util.Utils ;
+
import org.apache.jena.riot.TypedInputStream2 ;
-import org.apache.jena.riot.stream.LocationMapper2 ;
-import org.apache.jena.riot.stream.Locator ;
+import org.apache.jena.riot.stream.* ;
+import org.openjena.riot.RiotException ;
class AdapterLib
@@ -32,11 +34,6 @@ class AdapterLib
return new com.hp.hpl.jena.util.TypedStream(in.getInput(), in.getContentType(), in.getCharset()) ;
}
- public static com.hp.hpl.jena.util.LocationMapper convert(LocationMapper2 locMap)
- {
- return null ;
- }
-
public static LocationMapper2 copyConvert(com.hp.hpl.jena.util.LocationMapper locMap)
{
@@ -63,7 +60,25 @@ class AdapterLib
public static Locator convert(com.hp.hpl.jena.util.Locator oldloc)
{
- return null ;
+ 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()) ;
+ }
+ if ( oldloc instanceof com.hp.hpl.jena.util.LocatorClassLoader )
+ {
+ com.hp.hpl.jena.util.LocatorClassLoader classLoc = (com.hp.hpl.jena.util.LocatorClassLoader)oldloc ;
+ return new LocatorClassLoader(classLoc.getClassLoader()) ;
+ }
+ if ( oldloc instanceof com.hp.hpl.jena.util.LocatorURL )
+ return new LocatorURL2() ;
+ if ( oldloc instanceof com.hp.hpl.jena.util.LocatorZip )
+ {
+ com.hp.hpl.jena.util.LocatorZip zipLoc = (com.hp.hpl.jena.util.LocatorZip)oldloc ;
+ return new LocatorZip(zipLoc.getZipFileName()) ;
+ }
+
+ throw new RiotException("Unrecognized Locator: "+Utils.className(oldloc)) ;
}
}
Modified: jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java (original)
+++ jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/JenaIOEnvironment.java Sat Sep 29 22:47:43 2012
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.vocabulary.Locati
/** Code for using the general facilities of the location mapper/ filemanager subsystem
* and set up for Jena usage. e.g. find a location mapper with RDf description.
*/
-public class JenaIOEnvironment
+class JenaIOEnvironment
{
static LocationMapper2 theMapper = null ;
/** Get the global LocationMapper */
Modified: jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java (original)
+++ jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorClassLoader.java Sat Sep 29 22:47:43 2012
@@ -30,7 +30,7 @@ public class LocatorClassLoader impleme
{
static Logger log = LoggerFactory.getLogger(LocatorClassLoader.class) ;
- ClassLoader classLoader = null ;
+ private final ClassLoader classLoader ;
public LocatorClassLoader(ClassLoader _classLoader)
{
classLoader =_classLoader ;
@@ -70,6 +70,11 @@ public class LocatorClassLoader impleme
return new TypedInputStream2(in, ct, null) ;
}
+ public ClassLoader getClassLoader()
+ {
+ return classLoader ;
+ }
+
@Override
public String getName() { return "ClassLoaderLocator" ; }
Modified: jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java (original)
+++ jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorFile2.java Sat Sep 29 22:47:43 2012
@@ -41,8 +41,8 @@ import com.hp.hpl.jena.util.FileUtils ;
public class LocatorFile2 implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorFile2.class) ;
- private String altDir = null ;
- private String altDirLogStr = "" ;
+ private final String thisDir ;
+ private final String thisDirLogStr ;
/** Create a LocatorFile */
public LocatorFile2() { this(null) ; }
@@ -57,9 +57,11 @@ public class LocatorFile2 implements Loc
{
if ( dir.endsWith("/") || dir.endsWith(java.io.File.separator) )
dir = dir.substring(0,dir.length()-1) ;
- altDirLogStr = " ["+dir+"]" ;
+ thisDirLogStr = " ["+dir+"]" ;
}
- altDir = dir ;
+ else
+ thisDirLogStr = "" ;
+ thisDir = dir ;
}
// Two LocatorFile are the same if they would look up names to the same files.
@@ -83,11 +85,16 @@ public class LocatorFile2 implements Loc
// fn is the file name to use.
// If it is relative, and we have a different working directory, prepend that.
// "/" is a path separator on Windows as well.
- if ( altDir != null && ! fn.startsWith("/") && ! fn.startsWith(File.separator) )
- fn = altDir+"/"+fn ;
+ if ( thisDir != null && ! fn.startsWith("/") && ! fn.startsWith(File.separator) )
+ fn = thisDir+"/"+fn ;
return fn ;
}
+ public String getThisDir()
+ {
+ return thisDir ;
+ }
+
public boolean exists(String fileIRI)
{
String fn = toFileName(fileIRI) ;
@@ -114,7 +121,7 @@ public class LocatorFile2 implements Loc
if ( ! exists$(fn) )
{
if ( StreamManager.logAllLookups && log.isTraceEnabled())
- log.trace("Not found: "+filenameIRI+altDirLogStr) ;
+ log.trace("Not found: "+filenameIRI+thisDirLogStr) ;
return null ;
}
} catch (AccessControlException e) {
@@ -126,7 +133,7 @@ public class LocatorFile2 implements Loc
InputStream in = IO.openFileEx(fn) ;
if ( StreamManager.logAllLookups && log.isTraceEnabled() )
- log.trace("Found: "+filenameIRI+altDirLogStr) ;
+ log.trace("Found: "+filenameIRI+thisDirLogStr) ;
ContentType ct = Langs.guessContentType(filenameIRI) ;
return new TypedInputStream2(in, ct, filenameIRI) ;
@@ -143,8 +150,8 @@ public class LocatorFile2 implements Loc
public String getName()
{
String tmp = "LocatorFile" ;
- if ( altDir != null )
- tmp = tmp+"("+altDir+")" ;
+ if ( thisDir != null )
+ tmp = tmp+"("+thisDir+")" ;
return tmp ;
}
@@ -153,8 +160,8 @@ public class LocatorFile2 implements Loc
{
final int prime = 31 ;
int result = 1 ;
- result = prime * result + ((altDir == null) ? 0 : altDir.hashCode()) ;
- result = prime * result + ((altDirLogStr == null) ? 0 : altDirLogStr.hashCode()) ;
+ result = prime * result + ((thisDir == null) ? 0 : thisDir.hashCode()) ;
+ result = prime * result + ((thisDirLogStr == null) ? 0 : thisDirLogStr.hashCode()) ;
return result ;
}
@@ -165,16 +172,16 @@ public class LocatorFile2 implements Loc
if (obj == null) return false ;
if (getClass() != obj.getClass()) return false ;
LocatorFile2 other = (LocatorFile2)obj ;
- if (altDir == null)
+ if (thisDir == null)
{
- if (other.altDir != null) return false ;
+ if (other.thisDir != null) return false ;
} else
- if (!altDir.equals(other.altDir)) return false ;
- if (altDirLogStr == null)
+ if (!thisDir.equals(other.thisDir)) return false ;
+ if (thisDirLogStr == null)
{
- if (other.altDirLogStr != null) return false ;
+ if (other.thisDirLogStr != null) return false ;
} else
- if (!altDirLogStr.equals(other.altDirLogStr)) return false ;
+ if (!thisDirLogStr.equals(other.thisDirLogStr)) return false ;
return true ;
}
}
Modified: jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorZip.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorZip.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorZip.java (original)
+++ jena/Experimental/riot-reader/src/main/java/org/apache/jena/riot/stream/LocatorZip.java Sat Sep 29 22:47:43 2012
@@ -85,6 +85,12 @@ public class LocatorZip implements Locat
return null;
}
}
+
+ public String getZipFileName()
+ {
+ return zipFileName ;
+ }
+
@Override
public String getName() { return "LocatorZip("+zipFileName+")" ; }
Modified: jena/Scratch/AFS/Dev/trunk/src-dev/dev/BindingN.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-dev/dev/BindingN.java?rev=1391915&r1=1391914&r2=1391915&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-dev/dev/BindingN.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-dev/dev/BindingN.java Sat Sep 29 22:47:43 2012
@@ -37,7 +37,9 @@ public class BindingN extends BindingBas
super(_parent) ;
}
+ // Cost = object overhead + parent + 3*var + 3*node always.
// Or dynamically switch to using a pair of [].
+ // Or switch to a single binding unit (cost = object overhead + parent + var + node -> not much)
private Var var1 = null ;
private Node node1 = null ;