diff options
author | Lillian Angel <langel@redhat.com> | 2006-05-24 20:14:22 +0000 |
---|---|---|
committer | Lillian Angel <langel@redhat.com> | 2006-05-24 20:14:22 +0000 |
commit | 1bab8d5e10e17122ea656b5ce4cb73a3cacf317a (patch) | |
tree | d7a477aec9c5f20d65103cd7b3edff06f97bafd3 | |
parent | d904c6e7f0d06d8ebc20db20fc1f0ecd3c161dfa (diff) | |
download | classpath-1bab8d5e10e17122ea656b5ce4cb73a3cacf317a.tar.gz |
2006-05-24 Lillian Angel <langel@redhat.com>
* tools/gnu/classpath/tools/appletviewer/AppletTag.java
(prependCodeBase): Added check to determine if the documentbase
points to a directory or a file.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | tools/gnu/classpath/tools/appletviewer/AppletTag.java | 22 |
2 files changed, 19 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2006-05-24 Lillian Angel <langel@redhat.com> + + * tools/gnu/classpath/tools/appletviewer/AppletTag.java + (prependCodeBase): Added check to determine if the documentbase + points to a directory or a file. + 2006-05-24 Sven de Marothy <sven@physto.se> * java/awt/dnd/DragGestureRecognizer.java diff --git a/tools/gnu/classpath/tools/appletviewer/AppletTag.java b/tools/gnu/classpath/tools/appletviewer/AppletTag.java index b2d7ccb2b..4c3d01edb 100644 --- a/tools/gnu/classpath/tools/appletviewer/AppletTag.java +++ b/tools/gnu/classpath/tools/appletviewer/AppletTag.java @@ -451,15 +451,19 @@ class AppletTag else { String dirname = documentbase.getFile(); - - // Determine dirname for file by stripping everything - // past the last file separator. - dirname = dirname.substring(0, - dirname.lastIndexOf(File.separatorChar) + 1); - - fullcodebase = new URL(documentbase.getProtocol(), - documentbase.getHost(), - documentbase.getPort(), dirname); + if (!new File(dirname).isFile()) + fullcodebase = new URL(documentbase + File.separator); + else + { + // Determine dirname for file by stripping everything + // past the last file separator. + dirname = dirname.substring(0, + dirname.lastIndexOf(File.separatorChar) + 1); + + fullcodebase = new URL(documentbase.getProtocol(), + documentbase.getHost(), + documentbase.getPort(), dirname); + } } } else |