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:46:45 UTC
svn commit: r1391914 - in
/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util:
LocatorClassLoader.java LocatorFile.java LocatorZip.java
Author: andy
Date: Sat Sep 29 22:46:44 2012
New Revision: 1391914
URL: http://svn.apache.org/viewvc?rev=1391914&view=rev
Log:
Expose internal state variables of locators.
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java?rev=1391914&r1=1391913&r2=1391914&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorClassLoader.java Sat Sep 29 22:46:44 2012
@@ -28,7 +28,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 ;
@@ -73,6 +73,12 @@ public class LocatorClassLoader impleme
// base = classLoader.getResource(fn).toExternalForm ;
return new TypedStream(in) ;
}
+
+ public ClassLoader getClassLoader()
+ {
+ return classLoader ;
+ }
+
@Override
public String getName() { return "ClassLoaderLocator" ; }
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java?rev=1391914&r1=1391913&r2=1391914&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorFile.java Sat Sep 29 22:46:44 2012
@@ -35,37 +35,18 @@ import org.slf4j.LoggerFactory;
public class LocatorFile implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorFile.class) ;
- private String altDir = null ;
- private String altDirLogStr = "" ;
+ private String thisDir = null ;
+ private String thisDirLogStr = "" ;
public LocatorFile(String dir)
{
-// if ( false )
-// {
-// if ( dir == null )
-// {
-// try {
-// //String wd = JenaRuntime.getSystemProperty("user.dir") ;
-// String wd = new File(".").getCanonicalPath() ;
-// log.debug("Base file directory: "+wd) ;
-// } catch (IOException ex)
-// {
-// log.error("Failed to discover the working directory", ex) ;
-// }
-// return ;
-// }
-// else
-// {
-// log.debug("Base file directory: "+dir) ;
-// }
-// }
if ( dir != null )
{
if ( dir.endsWith("/") || dir.endsWith(java.io.File.separator) )
dir = dir.substring(0,dir.length()-1) ;
- altDirLogStr = " ["+dir+"]" ;
+ thisDirLogStr = " ["+dir+"]" ;
}
- altDir = dir ;
+ thisDir = dir ;
}
LocatorFile()
@@ -78,7 +59,7 @@ public class LocatorFile implements Loca
{
return
other instanceof LocatorFile
- && equals( altDir, ((LocatorFile) other).altDir );
+ && equals( thisDir, ((LocatorFile) other).thisDir );
}
private boolean equals( String a, String b )
@@ -89,9 +70,9 @@ public class LocatorFile implements Loca
@Override
public int hashCode()
{
- if ( altDir == null )
+ if ( thisDir == null )
return 157 ;
- return altDir.hashCode();
+ return thisDir.hashCode();
}
private File toFile(String filenameOrURI)
@@ -100,8 +81,8 @@ public class LocatorFile implements Loca
if ( fn == null )
return null ;
- if ( altDir != null && ! fn.startsWith("/") && ! fn.startsWith(FileManager.filePathSeparator) )
- fn = altDir+java.io.File.separator+fn ;
+ if ( thisDir != null && ! fn.startsWith("/") && ! fn.startsWith(FileManager.filePathSeparator) )
+ fn = thisDir+java.io.File.separator+fn ;
return new File(fn) ;
}
@@ -128,7 +109,7 @@ public class LocatorFile implements Loca
if ( f == null || !f.exists() )
{
if ( FileManager.logAllLookups && log.isTraceEnabled())
- log.trace("Not found: "+filenameOrURI+altDirLogStr) ;
+ log.trace("Not found: "+filenameOrURI+thisDirLogStr) ;
return null ;
}
} catch (AccessControlException e) {
@@ -140,7 +121,7 @@ public class LocatorFile implements Loca
InputStream in = new FileInputStream(f) ;
if ( FileManager.logAllLookups && log.isTraceEnabled() )
- log.trace("Found: "+filenameOrURI+altDirLogStr) ;
+ log.trace("Found: "+filenameOrURI+thisDirLogStr) ;
// Create base -- Java 1.4-isms
@@ -155,12 +136,15 @@ public class LocatorFile implements Loca
return null ;
}
}
+
+ public String getDir() { return thisDir ; }
+
@Override
public String getName()
{
String tmp = "LocatorFile" ;
- if ( altDir != null )
- tmp = tmp+"("+altDir+")" ;
+ if ( thisDir != null )
+ tmp = tmp+"("+thisDir+")" ;
return tmp ;
}
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java?rev=1391914&r1=1391913&r2=1391914&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/LocatorZip.java Sat Sep 29 22:46:44 2012
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.shared.JenaExcept
/** Location files in a zip file */
-class LocatorZip implements Locator
+public class LocatorZip implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorZip.class) ;
String zipFileName = null ;
@@ -80,6 +80,9 @@ class LocatorZip implements Locator
return null;
}
}
+
+ public String getZipFileName() { return zipFileName ; }
+
@Override
public String getName() { return "LocatorZip("+zipFileName+")" ; }