Mercurial > hg > openjdk > jigsaw > langtools
changeset 1787:a03c4a86ea2b
8010361: fix some langtools findbugs issues
Reviewed-by: darcy
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ * deletion without notice.</b> */ public class Code_attribute extends Attribute { - public class InvalidIndex extends AttributeException { + public static class InvalidIndex extends AttributeException { private static final long serialVersionUID = -8904527774589382802L; InvalidIndex(int index) { this.index = index; @@ -143,7 +143,7 @@ public final Exception_data[] exception_table; public final Attributes attributes; - public class Exception_data { + public static class Exception_data { Exception_data(ClassReader cr) throws IOException { start_pc = cr.readUnsignedShort(); end_pc = cr.readUnsignedShort();
--- a/src/share/classes/com/sun/tools/classfile/Descriptor.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -37,7 +37,7 @@ * deletion without notice.</b> */ public class Descriptor { - public class InvalidDescriptor extends DescriptorException { + public static class InvalidDescriptor extends DescriptorException { private static final long serialVersionUID = 1L; InvalidDescriptor(String desc) { this.desc = desc;
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue Mar 19 17:04:03 2013 -0700 @@ -56,7 +56,7 @@ /** * Exception used to report a problem during setOptions. */ - public class Fault extends Exception { + public static class Fault extends Exception { private static final long serialVersionUID = 0; Fault(String msg) {
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -116,9 +116,9 @@ * @param contentTree the content tree to which the documentation will be added */ public void buildAnnotationTypeDoc(XMLNode node, Content contentTree) throws Exception { - contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") + + contentTree = writer.getHeader(configuration.getText("doclet.AnnotationType") + " " + annotationTypeDoc.name()); - Content annotationContentTree = writer.getAnnotationContentHeader(); + Content annotationContentTree = writer.getAnnotationContentHeader(); buildChildren(node, annotationContentTree); contentTree.addContent(annotationContentTree); writer.addFooter(contentTree);
--- a/src/share/classes/com/sun/tools/javah/Util.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/javah/Util.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -144,10 +144,6 @@ throw new Exit(15); } - private void fatal(String msg) throws Exit { - fatal(msg, null); - } - private void fatal(String msg, Exception e) throws Exit { dl.report(createDiagnostic(Diagnostic.Kind.ERROR, "", msg)); throw new Exit(10, e);
--- a/src/share/classes/com/sun/tools/javap/StackMapWriter.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/javap/StackMapWriter.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -269,7 +269,7 @@ } - class StackMap { + static class StackMap { StackMap(verification_type_info[] locals, verification_type_info[] stack) { this.locals = locals; this.stack = stack; @@ -279,7 +279,7 @@ private final verification_type_info[] stack; } - class CustomVerificationTypeInfo extends verification_type_info { + static class CustomVerificationTypeInfo extends verification_type_info { public CustomVerificationTypeInfo(String text) { super(-1); this.text = text;
--- a/src/share/classes/com/sun/tools/jdeps/JdepsTask.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/jdeps/JdepsTask.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ * Implementation for the jdeps tool for static class dependency analysis. */ class JdepsTask { - class BadArgs extends Exception { + static class BadArgs extends Exception { static final long serialVersionUID = 8765093759964640721L; BadArgs(String key, Object... args) { super(JdepsTask.getMessage(key, args)); @@ -119,7 +119,7 @@ } else if ("class".equals(arg)) { task.options.verbose = Analyzer.Type.CLASS; } else { - throw task.new BadArgs("err.invalid.arg.for.option", opt); + throw new BadArgs("err.invalid.arg.for.option", opt); } } }, @@ -142,7 +142,7 @@ void process(JdepsTask task, String opt, String arg) throws BadArgs { task.options.showProfile = true; if (Profiles.getProfileCount() == 0) { - throw task.new BadArgs("err.option.unsupported", opt, getMessage("err.profiles.msg")); + throw new BadArgs("err.option.unsupported", opt, getMessage("err.profiles.msg")); } } }, @@ -156,7 +156,7 @@ try { task.options.depth = Integer.parseInt(arg); } catch (NumberFormatException e) { - throw task.new BadArgs("err.invalid.arg.for.option", opt); + throw new BadArgs("err.invalid.arg.for.option", opt); } } }, @@ -515,7 +515,6 @@ boolean help; boolean version; boolean fullVersion; - boolean showFlags; boolean showProfile; boolean showSummary; boolean wildcard;
--- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,6 @@ private static List<Archive> init() { List<Archive> result = new ArrayList<Archive>(); String javaHome = System.getProperty("java.home"); - List<File> files = new ArrayList<File>(); File jre = new File(javaHome, "jre"); File lib = new File(javaHome, "lib");
--- a/src/share/classes/com/sun/tools/sjavac/Main.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/sjavac/Main.java Tue Mar 19 17:04:03 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,18 +26,13 @@ package com.sun.tools.sjavac; import java.io.File; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import com.sun.tools.sjavac.server.JavacServer; import java.io.IOException; import java.io.PrintStream; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import com.sun.tools.sjavac.server.JavacServer; /** * The main class of the smart javac wrapper tool. @@ -268,12 +263,12 @@ // Find all class files allowable for linking. // And pickup knowledge of all modules found here. // This cannot currently filter classes inside jar files. - Map<String,Source> classes_to_link_to = new HashMap<String,Source>(); +// Map<String,Source> classes_to_link_to = new HashMap<String,Source>(); // findFiles(args, "-classpath", Util.set(".class"), classes_to_link_to, modules, current_module, true); // Find all module sources allowable for linking. - Map<String,Source> modules_to_link_to = new HashMap<String,Source>(); - // findFiles(args, "-modulepath", Util.set(".class"), modules_to_link_to, modules, current_module, true); +// Map<String,Source> modules_to_link_to = new HashMap<String,Source>(); +// findFiles(args, "-modulepath", Util.set(".class"), modules_to_link_to, modules, current_module, true); // Add the set of sources to the build database. javac_state.now().collectPackagesSourcesAndArtifacts(modules); @@ -935,13 +930,13 @@ if (roots.contains(root)) { throw new ProblemException("\""+r+"\" has already been used for "+option); } - if (roots.equals(bin_dir)) { + if (root.equals(bin_dir)) { throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -d"); } - if (roots.equals(gensrc_dir)) { + if (root.equals(gensrc_dir)) { throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -s"); } - if (roots.equals(header_dir)) { + if (root.equals(header_dir)) { throw new ProblemException("\""+r+"\" cannot be used both for "+option+" and -h"); } roots.add(root);
--- a/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java Tue Mar 19 15:13:44 2013 -0700 +++ b/src/share/classes/com/sun/tools/sjavac/comp/Dependencies.java Tue Mar 19 17:04:03 2013 -0700 @@ -108,7 +108,7 @@ return new_deps; } - class CompareNames implements Comparator<Name> { + static class CompareNames implements Comparator<Name> { public int compare(Name a, Name b) { return a.toString().compareTo(b.toString()); }