1.1 --- a/src/share/classes/com/sun/tools/javac/file/ZipArchive.java Thu Sep 03 18:34:17 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/file/ZipArchive.java Tue Sep 08 11:12:13 2009 -0700 1.3 @@ -122,6 +122,7 @@ 1.4 zdir.close(); 1.5 } 1.6 1.7 + @Override 1.8 public String toString() { 1.9 return "ZipArchive[" + zdir.getName() + "]"; 1.10 } 1.11 @@ -154,6 +155,7 @@ 1.12 throw new UnsupportedOperationException(); 1.13 } 1.14 1.15 + @Override 1.16 protected CharsetDecoder getDecoder(boolean ignoreEncodingErrors) { 1.17 return fileManager.getDecoder(fileManager.getEncodingName(), ignoreEncodingErrors); 1.18 } 1.19 @@ -177,6 +179,7 @@ 1.20 } 1.21 1.22 @Deprecated 1.23 + @Override 1.24 public String getPath() { 1.25 return zarch.zdir.getName() + "(" + entry + ")"; 1.26 } 1.27 @@ -235,9 +238,8 @@ 1.28 } 1.29 1.30 public URI toUri() { 1.31 - String zipName = new File(getZipName()).toURI().normalize().getPath(); 1.32 - String entryName = getZipEntryName(); 1.33 - return URI.create("jar:" + zipName + "!" + entryName); 1.34 + File zipFile = new File(getZipName()); 1.35 + return createJarUri(zipFile, entry.getName()); 1.36 } 1.37 1.38 @Override