archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

4777949: Javap Rewrite : Warn javap usage on package classes with simple name

Browse source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2009-07-29 13:26:26 -07:00
parent 66637352ac
commit 54b80cfe2a
4 changed files with 174 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

75
langtools/src/share/classes/com/sun/tools/javap/JavapTask.java
View file

@ -316,17 +316,17 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
Iterable<String> classes) {
this(out, fileManager, diagnosticListener);
try {
handleOptions(options, false);
} catch (BadArgs e) {
throw new IllegalArgumentException(e.getMessage());
}
this.classes = new ArrayList<String>();
for (String classname: classes) {
classname.getClass(); // null-check
this.classes.add(classname);
}
try {
handleOptions(options, false);
} catch (BadArgs e) {
throw new IllegalArgumentException(e.getMessage());
}
}
public void setLocale(Locale locale) {
@ -372,10 +372,18 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
final PrintWriter pw = getPrintWriterForWriter(w);
return new DiagnosticListener<JavaFileObject> () {
public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
switch (diagnostic.getKind()) {
case ERROR:
pw.print(getMessage("err.prefix"));
pw.print(" ");
break;
case WARNING:
pw.print(getMessage("warn.prefix"));
break;
case NOTE:
pw.print(getMessage("note.prefix"));
break;
}
pw.print(" ");
pw.println(diagnostic.getMessage(null));
}
};
@ -405,7 +413,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
boolean ok = run();
return ok ? EXIT_OK : EXIT_ERROR;
} catch (BadArgs e) {
diagnosticListener.report(createDiagnostic(e.key, e.args));
reportError(e.key, e.args);
if (e.showUsage) {
log.println(getMessage("main.usage.summary", progname));
}
@ -419,7 +427,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
e_args[0] = e.getCause();
System.arraycopy(e.args, 0, e_args, 1, e.args.length);
}
diagnosticListener.report(createDiagnostic("err.internal.error", e_args));
reportError("err.internal.error", e_args);
return EXIT_ABNORMAL;
} finally {
log.flush();
@ -531,7 +539,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
StandardJavaFileManager sfm = (StandardJavaFileManager) fileManager;
fo = sfm.getJavaFileObjects(className).iterator().next();
} else {
diagnosticListener.report(createDiagnostic("err.not.standard.file.manager", className));
reportError("err.not.standard.file.manager", className);
ok = false;
continue;
}
@ -547,38 +555,42 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
}
}
if (fo == null) {
diagnosticListener.report(createDiagnostic("err.class.not.found", className));
reportError("err.class.not.found", className);
ok = false;
continue;
}
}
attributeFactory.setCompat(options.compat);
attributeFactory.setJSR277(options.jsr277);
write(read(fo));
ClassFileInfo cfInfo = read(fo);
if (!className.endsWith(".class")) {
String cfName = cfInfo.cf.getName();
if (!cfName.replaceAll("[/$]", ".").equals(className.replaceAll("[/$]", ".")))
reportWarning("warn.unexpected.class", className, cfName.replace('/', '.'));
}
write(cfInfo);
} catch (ConstantPoolException e) {
diagnosticListener.report(createDiagnostic("err.bad.constant.pool", className, e.getLocalizedMessage()));
reportError("err.bad.constant.pool", className, e.getLocalizedMessage());
ok = false;
} catch (EOFException e) {
diagnosticListener.report(createDiagnostic("err.end.of.file", className));
reportError("err.end.of.file", className);
ok = false;
} catch (FileNotFoundException e) {
diagnosticListener.report(createDiagnostic("err.file.not.found", e.getLocalizedMessage()));
reportError("err.file.not.found", e.getLocalizedMessage());
ok = false;
} catch (IOException e) {
//e.printStackTrace();
Object msg = e.getLocalizedMessage();
if (msg == null)
msg = e;
diagnosticListener.report(createDiagnostic("err.ioerror", className, msg));
reportError("err.ioerror", className, msg);
ok = false;
} catch (Throwable t) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
pw.close();
diagnosticListener.report(createDiagnostic("err.crash", t.toString(), sw.toString()));
reportError("err.crash", t.toString(), sw.toString());
ok = false;
}
}
@ -684,7 +696,7 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
}
private JavaFileManager getDefaultFileManager(final DiagnosticListener<? super JavaFileObject> dl, PrintWriter log) {
return JavapFileManager.create(dl, log, options);
return JavapFileManager.create(dl, log);
}
private JavaFileObject getClassFileObject(String className) throws IOException {
@ -738,10 +750,23 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
}
}
private Diagnostic<JavaFileObject> createDiagnostic(final String key, final Object... args) {
private void reportError(String key, Object... args) {
diagnosticListener.report(createDiagnostic(Diagnostic.Kind.ERROR, key, args));
}
private void reportNote(String key, Object... args) {
diagnosticListener.report(createDiagnostic(Diagnostic.Kind.NOTE, key, args));
}
private void reportWarning(String key, Object... args) {
diagnosticListener.report(createDiagnostic(Diagnostic.Kind.WARNING, key, args));
}
private Diagnostic<JavaFileObject> createDiagnostic(
final Diagnostic.Kind kind, final String key, final Object... args) {
return new Diagnostic<JavaFileObject>() {
public Kind getKind() {
return Diagnostic.Kind.ERROR;
return kind;
}
public JavaFileObject getSource() {
@ -776,6 +801,10 @@ public class JavapTask implements DisassemblerTool.DisassemblerTask, Messages {
return JavapTask.this.getMessage(locale, key, args);
}
public String toString() {
return getClass().getName() + "[key=" + key + ",args=" + Arrays.asList(args) + "]";
}
};
}