Java 1.5 cleanup.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@3688 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/util/tools/ToolBase.java b/dev/core/src/com/google/gwt/util/tools/ToolBase.java
index d5bb18f..5666aa5 100644
--- a/dev/core/src/com/google/gwt/util/tools/ToolBase.java
+++ b/dev/core/src/com/google/gwt/util/tools/ToolBase.java
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -64,23 +63,26 @@
// Use a tree map to sort the order.
//
- private final Map argHandlers = new TreeMap();
+ private final Map<String, ArgHandler> argHandlers = new TreeMap<String, ArgHandler>();
// Use a list to preserve the declared order for help printing.
//
- private final List orderedArgHandlers = new ArrayList();
+ private final List<ArgHandler> orderedArgHandlers = new ArrayList<ArgHandler>();
protected String getDescription() {
return null;
}
+ protected String getName() {
+ return getClass().getName();
+ }
+
protected void printHelp() {
System.err.println(About.GWT_VERSION);
ArgHandler nullHandler = null;
int widest = 0;
- for (Iterator iter = orderedArgHandlers.iterator(); iter.hasNext();) {
- ArgHandler handler = (ArgHandler) iter.next();
+ for (ArgHandler handler : orderedArgHandlers) {
if (handler.isUndocumented()) {
continue;
}
@@ -100,7 +102,7 @@
// Print the name.
//
- String name = getClass().getName();
+ String name = getName();
int i = name.lastIndexOf('.');
if (i != -1) {
name = name.substring(i + 1);
@@ -109,8 +111,7 @@
// Print the command-line template.
//
- for (Iterator iter = orderedArgHandlers.iterator(); iter.hasNext();) {
- ArgHandler handler = (ArgHandler) iter.next();
+ for (ArgHandler handler : orderedArgHandlers) {
if (handler.isUndocumented()) {
continue;
}
@@ -119,11 +120,11 @@
System.err.print(handler.isRequired() ? " " : " [");
System.err.print(tag);
String[] tagArgs = handler.getTagArgs();
- for (int j = 0; j < tagArgs.length; j++) {
+ for (String tagArg : tagArgs) {
if (handler.isRequired()) {
- System.err.print(" " + tagArgs[j]);
+ System.err.print(" " + tagArg);
} else {
- System.err.print(" " + tagArgs[j]);
+ System.err.print(" " + tagArg);
}
}
System.err.print(handler.isRequired() ? "" : "]");
@@ -134,9 +135,9 @@
//
if (nullHandler != null && !nullHandler.isUndocumented()) {
String[] tagArgs = nullHandler.getTagArgs();
- for (int j = 0; j < tagArgs.length; j++) {
+ for (String element : tagArgs) {
System.err.print(nullHandler.isRequired() ? " " : " [");
- System.err.print(tagArgs[j]);
+ System.err.print(element);
System.err.print(nullHandler.isRequired() ? " " : "]");
}
System.err.println();
@@ -153,8 +154,7 @@
// Print the details.
//
- for (Iterator iter = orderedArgHandlers.iterator(); iter.hasNext();) {
- ArgHandler handler = (ArgHandler) iter.next();
+ for (ArgHandler handler : orderedArgHandlers) {
if (handler.isUndocumented()) {
continue;
}
@@ -204,21 +204,21 @@
}
}
- Set defs = new HashSet(argHandlers.values());
+ Set<ArgHandler> defs = new HashSet<ArgHandler>(argHandlers.values());
int extraArgCount = 0;
- Set receivedArg = new HashSet();
+ Set<ArgHandler> receivedArg = new HashSet<ArgHandler>();
// Let the args drive the handlers.
//
- ArgHandler nullHandler = (ArgHandler) argHandlers.get("");
+ ArgHandler nullHandler = argHandlers.get("");
for (int i = 0; i < args.length; i++) {
String arg = args[i];
ArgHandler handler;
if (arg.startsWith("-")) {
// Use the handler registered for this flag.
//
- handler = (ArgHandler) argHandlers.get(arg);
+ handler = argHandlers.get(arg);
} else {
// Use the handler that doesn't have a leading flag.
//
@@ -251,8 +251,7 @@
// See if any handler didn't get its required argument(s).
//
- for (Iterator iter = argHandlers.values().iterator(); iter.hasNext();) {
- ArgHandler argHandler = (ArgHandler) iter.next();
+ for (ArgHandler argHandler : argHandlers.values()) {
if (argHandler.isRequired() && !receivedArg.contains(argHandler)) {
System.err.print("Missing required argument '");
String tag = argHandler.getTag();
@@ -281,8 +280,7 @@
// Set if there are any remaining unused handlers with default arguments.
// Allow the default handlers to pretend there were other arguments.
//
- for (Iterator iter = defs.iterator(); iter.hasNext();) {
- ArgHandler def = (ArgHandler) iter.next();
+ for (ArgHandler def : defs) {
String[] defArgs = def.getDefaultArgs();
if (defArgs != null) {
if (def.handle(defArgs, 0) == -1) {
