jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javap/JavapTask.java

-:bc0b1f404c40
+:526de25e0b28
 import java.io.FilterInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.net.URI;
 import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.NestingKind;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 import com.sun.tools.classfile.*;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
 /**
 *  "Main" class for javap, normally accessed from the command line
 *  via Main, or from JSR199 via DisassemblerTool.
 *
 return ok;
 }
 protected boolean writeClass(ClassWriter classWriter, String className)
 throws IOException, ConstantPoolException {
-JavaFileObject fo;
+JavaFileObject fo = open(className);
-if (className.endsWith(".class")) {
+if (fo == null) {
-if (fileManager instanceof StandardJavaFileManager) {
+reportError("err.class.not.found", className);
-StandardJavaFileManager sfm = (StandardJavaFileManager) fileManager;
+return false;
-fo = sfm.getJavaFileObjects(className).iterator().next();
-} else {
-reportError("err.not.standard.file.manager", className);
-return false;
-}
-} else {
-fo = getClassFileObject(className);
-if (fo == null) {
-// see if it is an inner class, by replacing dots to $, starting from the right
-String cn = className;
-int lastDot;
-while (fo == null && (lastDot = cn.lastIndexOf(".")) != -1) {
-cn = cn.substring(0, lastDot) + "$" + cn.substring(lastDot + 1);
-fo = getClassFileObject(cn);
-}
-}
-if (fo == null) {
-reportError("err.class.not.found", className);
-return false;
-}
 }
 ClassFileInfo cfInfo = read(fo);
 if (!className.endsWith(".class")) {
 String cfName = cfInfo.cf.getName();
 }
 return true;
 }
+protected JavaFileObject open(String className) throws IOException {
+// for compatibility, first see if it is a class name
+JavaFileObject fo = getClassFileObject(className);
+if (fo != null)
+return fo;
+// see if it is an inner class, by replacing dots to $, starting from the right
+String cn = className;
+int lastDot;
+while ((lastDot = cn.lastIndexOf(".")) != -1) {
+cn = cn.substring(0, lastDot) + "$" + cn.substring(lastDot + 1);
+fo = getClassFileObject(cn);
+if (fo != null)
+return fo;
+}
+if (!className.endsWith(".class"))
+return null;
+if (fileManager instanceof StandardJavaFileManager) {
+StandardJavaFileManager sfm = (StandardJavaFileManager) fileManager;
+fo = sfm.getJavaFileObjects(className).iterator().next();
+if (fo != null && fo.getLastModified() != 0) {
+return fo;
+}
+}
+// see if it is a URL, and if so, wrap it in just enough of a JavaFileObject
+// to suit javap's needs
+if (className.matches("^[A-Za-z]+:.*")) {
+try {
+final URI uri = new URI(className);
+final URL url = uri.toURL();
+final URLConnection conn = url.openConnection();
+return new JavaFileObject() {
+public Kind getKind() {
+return JavaFileObject.Kind.CLASS;
+}
+public boolean isNameCompatible(String simpleName, Kind kind) {
+throw new UnsupportedOperationException();
+}
+public NestingKind getNestingKind() {
+throw new UnsupportedOperationException();
+}
+public Modifier getAccessLevel() {
+throw new UnsupportedOperationException();
+}
+public URI toUri() {
+return uri;
+}
+public String getName() {
+return url.toString();
+}
+public InputStream openInputStream() throws IOException {
+return conn.getInputStream();
+}
+public OutputStream openOutputStream() throws IOException {
+throw new UnsupportedOperationException();
+}
+public Reader openReader(boolean ignoreEncodingErrors) throws IOException {
+throw new UnsupportedOperationException();
+}
+public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+throw new UnsupportedOperationException();
+}
+public Writer openWriter() throws IOException {
+throw new UnsupportedOperationException();
+}
+public long getLastModified() {
+return conn.getLastModified();
+}
+public boolean delete() {
+throw new UnsupportedOperationException();
+}
+};
+} catch (URISyntaxException ignore) {
+} catch (IOException ignore) {
+}
+}
+return null;
+}
 public static class ClassFileInfo {
 ClassFileInfo(JavaFileObject fo, ClassFile cf, byte[] digest, int size) {
 this.fo = fo;
 this.cf = cf;
 this.digest = digest;

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javap/JavapTask.java

src/share/classes/com/sun/tools/javap/JavapTask.java