1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed Sep 23 18:29:41 2009 -0700 1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Wed Sep 23 18:48:13 2009 -0700 1.3 @@ -2563,38 +2563,73 @@ 1.4 this.flatname = flatname; 1.5 } 1.6 1.7 + @Override 1.8 + public URI toUri() { 1.9 + try { 1.10 + return new URI(null, name.toString(), null); 1.11 + } catch (URISyntaxException e) { 1.12 + throw new CannotCreateUriError(name.toString(), e); 1.13 + } 1.14 + } 1.15 + 1.16 + @Override 1.17 + public String getName() { 1.18 + return name.toString(); 1.19 + } 1.20 + 1.21 + @Override 1.22 + public String getShortName() { 1.23 + return getName(); 1.24 + } 1.25 + 1.26 + @Override 1.27 + public JavaFileObject.Kind getKind() { 1.28 + return getKind(getName()); 1.29 + } 1.30 + 1.31 + @Override 1.32 public InputStream openInputStream() { 1.33 throw new UnsupportedOperationException(); 1.34 } 1.35 1.36 + @Override 1.37 public OutputStream openOutputStream() { 1.38 throw new UnsupportedOperationException(); 1.39 } 1.40 1.41 - public Reader openReader() { 1.42 + @Override 1.43 + public CharBuffer getCharContent(boolean ignoreEncodingErrors) { 1.44 throw new UnsupportedOperationException(); 1.45 } 1.46 1.47 + @Override 1.48 + public Reader openReader(boolean ignoreEncodingErrors) { 1.49 + throw new UnsupportedOperationException(); 1.50 + } 1.51 + 1.52 + @Override 1.53 public Writer openWriter() { 1.54 throw new UnsupportedOperationException(); 1.55 } 1.56 1.57 - /** @deprecated see bug 6410637 */ 1.58 - @Deprecated 1.59 - public String getName() { 1.60 - return name.toString(); 1.61 - } 1.62 - 1.63 + @Override 1.64 public long getLastModified() { 1.65 throw new UnsupportedOperationException(); 1.66 } 1.67 1.68 + @Override 1.69 public boolean delete() { 1.70 throw new UnsupportedOperationException(); 1.71 } 1.72 1.73 - public CharBuffer getCharContent(boolean ignoreEncodingErrors) { 1.74 - throw new UnsupportedOperationException(); 1.75 + @Override 1.76 + protected String inferBinaryName(Iterable<? extends File> path) { 1.77 + return flatname.toString(); 1.78 + } 1.79 + 1.80 + @Override 1.81 + public boolean isNameCompatible(String simpleName, JavaFileObject.Kind kind) { 1.82 + return true; // fail-safe mode 1.83 } 1.84 1.85 @Override 1.86 @@ -2609,27 +2644,5 @@ 1.87 public int hashCode() { 1.88 return name.hashCode(); 1.89 } 1.90 - 1.91 - public boolean isNameCompatible(String simpleName, JavaFileObject.Kind kind) { 1.92 - return true; // fail-safe mode 1.93 - } 1.94 - 1.95 - public URI toUri() { 1.96 - try { 1.97 - return new URI(null, name.toString(), null); 1.98 - } catch (URISyntaxException e) { 1.99 - throw new CannotCreateUriError(name.toString(), e); 1.100 - } 1.101 - } 1.102 - 1.103 - @Override 1.104 - public Reader openReader(boolean ignoreEncodingErrors) throws IOException { 1.105 - throw new UnsupportedOperationException(); 1.106 - } 1.107 - 1.108 - @Override 1.109 - protected String inferBinaryName(Iterable<? extends File> path) { 1.110 - return flatname.toString(); 1.111 - } 1.112 } 1.113 }