diff options
Diffstat (limited to 'libjava/classpath/gnu/java/net/loader')
8 files changed, 19 insertions, 19 deletions
diff --git a/libjava/classpath/gnu/java/net/loader/FileResource.java b/libjava/classpath/gnu/java/net/loader/FileResource.java index 8071bbf..4715840 100644 --- a/libjava/classpath/gnu/java/net/loader/FileResource.java +++ b/libjava/classpath/gnu/java/net/loader/FileResource.java @@ -79,4 +79,4 @@ public final class FileResource extends Resource throw ie; } } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/FileURLLoader.java b/libjava/classpath/gnu/java/net/loader/FileURLLoader.java index 39d33a4..58b6dcf 100644 --- a/libjava/classpath/gnu/java/net/loader/FileURLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/FileURLLoader.java @@ -66,7 +66,7 @@ public final class FileURLLoader extends URLLoader /** get resource with the name "name" in the file url */ public Resource getResource(String name) { - try + try { // Make sure that all components in name are valid by walking through // them @@ -91,7 +91,7 @@ public final class FileURLLoader extends URLLoader * directory or a non directory component (plain file, symbolic link, ...). * An empty or null path is valid. Pathnames components are separated by * <code>File.separatorChar</code> - * + * * @param resourceFileName the name to be checked for validity. * @return the canonical file pointed by the resourceFileName or null if the * walking failed @@ -108,30 +108,30 @@ public final class FileURLLoader extends URLLoader for (int i = 0; i < tokenCount - 1; i++) { String currentToken = stringTokenizer.nextToken(); - + // If we are at the root directory and trying to go up, the walking is // finished with an error if ("..".equals(currentToken) && currentFile.equals(dir)) return null; - + currentFile = new File(currentFile, currentToken); // If the current file doesn't exist or is not a directory, the walking is // finished with an error if (! (currentFile.exists() && currentFile.isDirectory())) return null; - + } - + // Treat the last token differently, if it exists, because it does not need // to be a directory if (tokenCount > 0) { String currentToken = stringTokenizer.nextToken(); - + if ("..".equals(currentToken) && currentFile.equals(dir)) return null; - + currentFile = new File(currentFile, currentToken); // If the current file doesn't exist, the walking is @@ -139,7 +139,7 @@ public final class FileURLLoader extends URLLoader if (! currentFile.exists()) return null; } - + return currentFile.getCanonicalFile(); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/JarURLLoader.java b/libjava/classpath/gnu/java/net/loader/JarURLLoader.java index 40194be..6f06ad3 100644 --- a/libjava/classpath/gnu/java/net/loader/JarURLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/JarURLLoader.java @@ -83,7 +83,7 @@ public final class JarURLLoader extends URLLoader { jarfile = ((JarURLConnection) baseJarURL.openConnection()).getJarFile(); - + Manifest manifest; Attributes attributes; String classPathString; @@ -124,12 +124,12 @@ public final class JarURLLoader extends URLLoader else if ((manifest = jarfile.getManifest()) != null && (attributes = manifest.getMainAttributes()) != null && ((classPathString - = attributes.getValue(Attributes.Name.CLASS_PATH)) + = attributes.getValue(Attributes.Name.CLASS_PATH)) != null)) { this.classPath = new ArrayList<URLLoader>(); StringTokenizer st = new StringTokenizer(classPathString, " "); - while (st.hasMoreElements ()) + while (st.hasMoreElements ()) { String e = st.nextToken (); try diff --git a/libjava/classpath/gnu/java/net/loader/JarURLResource.java b/libjava/classpath/gnu/java/net/loader/JarURLResource.java index a9db5ce..1dec92f 100644 --- a/libjava/classpath/gnu/java/net/loader/JarURLResource.java +++ b/libjava/classpath/gnu/java/net/loader/JarURLResource.java @@ -91,4 +91,4 @@ public final class JarURLResource extends Resource throw ie; } } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/RemoteResource.java b/libjava/classpath/gnu/java/net/loader/RemoteResource.java index f180315..dc33b66 100644 --- a/libjava/classpath/gnu/java/net/loader/RemoteResource.java +++ b/libjava/classpath/gnu/java/net/loader/RemoteResource.java @@ -75,4 +75,4 @@ public final class RemoteResource extends Resource { return url; } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java b/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java index f044740..81ef34f 100644 --- a/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/RemoteURLLoader.java @@ -98,4 +98,4 @@ public final class RemoteURLLoader extends URLLoader return null; } } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/Resource.java b/libjava/classpath/gnu/java/net/loader/Resource.java index e367a33..53720b0 100644 --- a/libjava/classpath/gnu/java/net/loader/Resource.java +++ b/libjava/classpath/gnu/java/net/loader/Resource.java @@ -107,4 +107,4 @@ public abstract class Resource * this resource can be loaded. */ public abstract InputStream getInputStream() throws IOException; -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/java/net/loader/URLLoader.java b/libjava/classpath/gnu/java/net/loader/URLLoader.java index 5b9b674..337564f 100644 --- a/libjava/classpath/gnu/java/net/loader/URLLoader.java +++ b/libjava/classpath/gnu/java/net/loader/URLLoader.java @@ -145,4 +145,4 @@ public abstract class URLLoader { return null; } -}
\ No newline at end of file +} |