6764569: [PATCH] Fix unused imports in list resource bundles
Reviewed-by: ksrini
diff --git a/langtools/make/tools/CompileProperties/CompileProperties.java b/langtools/make/tools/CompileProperties/CompileProperties.java
index f498815..7e2d5dc 100644
--- a/langtools/make/tools/CompileProperties/CompileProperties.java
+++ b/langtools/make/tools/CompileProperties/CompileProperties.java
@@ -101,7 +101,7 @@
boolean ok = true;
/* Original usage */
if (args.length == 2 && args[0].charAt(0) != '-' ) {
- ok = createFile(args[0], args[1], "ListResourceBundle");
+ ok = createFile(args[0], args[1], "java.util.ListResourceBundle");
} else if (args.length == 3) {
ok = createFile(args[0], args[1], args[2]);
} else if (args.length == 0) {
@@ -285,9 +285,9 @@
log.info(" java CompileProperties {-compile path_to_properties_file path_to_java_output_file super_class} -or- -optionsfile filename");
log.info("");
log.info("Example:");
- log.info(" java CompileProperties -compile test.properties test.java ListResourceBundle");
+ log.info(" java CompileProperties -compile test.properties test.java java.util.ListResourceBundle");
log.info(" java CompileProperties -optionsfile option_file");
- log.info("option_file contains: -compile test.properties test.java ListResourceBundle");
+ log.info("option_file contains: -compile test.properties test.java java.util.ListResourceBundle");
}
private static String escape(String theString) {
@@ -379,7 +379,6 @@
private static final String FORMAT =
"{0}" +
- "import java.util.ListResourceBundle;\n\n" +
"public final class {1} extends {2} '{'\n" +
" protected final Object[][] getContents() '{'\n" +
" return new Object[][] '{'\n" +
diff --git a/langtools/make/tools/CompileProperties/CompilePropertiesTask.java b/langtools/make/tools/CompileProperties/CompilePropertiesTask.java
index e7a0be1..bed9e27 100644
--- a/langtools/make/tools/CompileProperties/CompilePropertiesTask.java
+++ b/langtools/make/tools/CompileProperties/CompilePropertiesTask.java
@@ -45,6 +45,7 @@
this.superclass = superclass;
}
+ @Override
public void execute() {
CompileProperties.Log log = new CompileProperties.Log() {
public void error(String msg, Exception e) {
@@ -84,7 +85,7 @@
log("Generating " + count + " resource files to " + destDir, Project.MSG_INFO);
CompileProperties cp = new CompileProperties();
cp.setLog(log);
- boolean ok = cp.run((String[])mainOpts.toArray(new String[mainOpts.size()]));
+ boolean ok = cp.run(mainOpts.toArray(new String[mainOpts.size()]));
if (!ok)
throw new BuildException("CompileProperties failed.");
}
