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

-:1e39ae45d8ac
+:a51b7fd0543b
 new HiddenOption(false, "-showlabel") {
 void process(JdepsTask task, String opt, String arg) {
 task.options.showLabel = true;
 }
 },
+new HiddenOption(false, "-q", "-quiet") {
+void process(JdepsTask task, String opt, String arg) {
+task.options.nowarning = true;
+}
+},
 new HiddenOption(true, "-depth") {
 void process(JdepsTask task, String opt, String arg) throws BadArgs {
 try {
 task.options.depth = Integer.parseInt(arg);
 } catch (NumberFormatException e) {
 },
 };
 private static final String PROGNAME = "jdeps";
 private final Options options = new Options();
-private final List<String> classes = new ArrayList<String>();
+private final List<String> classes = new ArrayList<>();
 private PrintWriter log;
 void setLog(PrintWriter out) {
 log = out;
 }
 // parse classfiles and find all dependencies
 findDependencies();
 Analyzer analyzer = new Analyzer(options.verbose, new Analyzer.Filter() {
 @Override
-public boolean accepts(Location origin, Archive originArchive, Location target, Archive targetArchive) {
+public boolean accepts(Location origin, Archive originArchive,
+Location target, Archive targetArchive)
+{
 if (options.findJDKInternals) {
 // accepts target that is JDK class but not exported
 return isJDKArchive(targetArchive) &&
 !((JDKArchive) targetArchive).isExported(target.getClassName());
 } else if (options.filterSameArchive) {
 Path dir = Paths.get(options.dotOutputDir);
 Files.createDirectories(dir);
 generateDotFiles(dir, analyzer);
 } else {
 printRawOutput(log, analyzer);
+}
+if (options.findJDKInternals && !options.nowarning) {
+showReplacements(analyzer);
 }
 return true;
 }
 private void generateSummaryDotFile(Path dir, Analyzer analyzer) throws IOException {
 boolean showProfile;
 boolean showSummary;
 boolean apiOnly;
 boolean showLabel;
 boolean findJDKInternals;
+boolean nowarning;
 // default is to show package-level dependencies
 // and filter references from same package
 Analyzer.Type verbose = PACKAGE;
 boolean filterSamePackage = true;
 boolean filterSameArchive = false;
 Pattern includePattern;   // apply to classes
 }
 private static class ResourceBundleHelper {
 static final ResourceBundle versionRB;
 static final ResourceBundle bundle;
+static final ResourceBundle jdkinternals;
 static {
 Locale locale = Locale.getDefault();
 try {
 bundle = ResourceBundle.getBundle("com.sun.tools.jdeps.resources.jdeps", locale);
 }
 try {
 versionRB = ResourceBundle.getBundle("com.sun.tools.jdeps.resources.version");
 } catch (MissingResourceException e) {
 throw new InternalError("version.resource.missing");
+}
+try {
+jdkinternals = ResourceBundle.getBundle("com.sun.tools.jdeps.resources.jdkinternals");
+} catch (MissingResourceException e) {
+throw new InternalError("Cannot find jdkinternals resource bundle");
 }
 }
 }
 private List<Archive> getClassPathArchives(String paths) throws IOException {
 int i = name.lastIndexOf('.');
 pn = i > 0 ? name.substring(0, i) : "";
 }
 return Profile.getProfile(pn);
 }
+/**
+* Returns the recommended replacement API for the given classname;
+* or return null if replacement API is not known.
+*/
+private String replacementFor(String cn) {
+String name = cn;
+String value = null;
+while (value == null && name != null) {
+try {
+value = ResourceBundleHelper.jdkinternals.getString(name);
+} catch (MissingResourceException e) {
+// go up one subpackage level
+int i = name.lastIndexOf('.');
+name = i > 0 ? name.substring(0, i) : null;
+}
+}
+return value;
+};
+private void showReplacements(Analyzer analyzer) {
+Map<String,String> jdkinternals = new TreeMap<>();
+boolean useInternals = false;
+for (Archive source : sourceLocations) {
+useInternals = useInternals || analyzer.hasDependences(source);
+for (String cn : analyzer.dependences(source)) {
+String repl = replacementFor(cn);
+if (repl != null && !jdkinternals.containsKey(cn)) {
+jdkinternals.put(cn, repl);
+}
+}
+}
+if (useInternals) {
+log.println();
+warning("warn.replace.useJDKInternals", getMessage("jdeps.wiki.url"));
+}
+if (!jdkinternals.isEmpty()) {
+log.println();
+log.format("%-40s %s%n", "JDK Internal API", "Suggested Replacement");
+log.format("%-40s %s%n", "----------------", "---------------------");
+for (Map.Entry<String,String> e : jdkinternals.entrySet()) {
+log.format("%-40s %s%n", e.getKey(), e.getValue());
+}
+}
+}
 }

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

comparison: src/share/classes/com/sun/tools/jdeps/JdepsTask.java

src/share/classes/com/sun/tools/jdeps/JdepsTask.java