From 81ad33d9e3130f6548620c784399a6e6e56ec0fe Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 24 Apr 2015 16:27:03 +0000
Subject: [PATCH] lint unchecked

---
 .../src/net/i2p/router/web/ConfigAdvancedHandler.java |  2 +-
 .../src/net/i2p/router/web/ConfigClientsHandler.java  | 11 ++++-------
 .../src/net/i2p/router/web/ConfigClientsHelper.java   |  4 ++--
 .../src/net/i2p/router/web/ConfigLoggingHelper.java   |  9 +++------
 .../src/net/i2p/router/web/ConfigTunnelsHelper.java   |  7 ++-----
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java
index e5db97f11..aa853f0cc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHandler.java
@@ -55,7 +55,7 @@ public class ConfigAdvancedHandler extends FormHandler {
                 return;
             }
 
-            for (Object key : props.keySet()) {
+            for (String key : props.stringPropertyNames()) {
                 unsetKeys.remove(key);
             }
 
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
index 605626211..72cd5dc8a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
@@ -8,7 +8,6 @@ import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -346,9 +345,8 @@ public class ConfigClientsHandler extends FormHandler {
 
     private void saveWebAppChanges() {
         Properties props = RouterConsoleRunner.webAppProperties(_context);
-        Set keys = props.keySet();
-        for (Iterator iter = keys.iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
+        Set<String> keys = props.stringPropertyNames();
+        for (String name : keys) {
             if (! (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)))
                 continue;
             String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED));
@@ -362,9 +360,8 @@ public class ConfigClientsHandler extends FormHandler {
 
     private void savePluginChanges() {
         Properties props = PluginStarter.pluginProperties();
-        Set keys = props.keySet();
-        for (Iterator iter = keys.iterator(); iter.hasNext(); ) {
-            String name = (String)iter.next();
+        Set<String> keys = props.stringPropertyNames();
+        for (String name : keys) {
             if (! (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED)))
                 continue;
             String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index 2a722ab75..75975c864 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -204,7 +204,7 @@ public class ConfigClientsHelper extends HelperBase {
            .append(_("Control")).append("</th><th align=\"left\">")
            .append(_("Description")).append("</th></tr>\n");
         Properties props = RouterConsoleRunner.webAppProperties(_context);
-        Set<String> keys = new TreeSet(props.keySet());
+        Set<String> keys = new TreeSet<String>(props.stringPropertyNames());
         for (String name : keys) {
             if (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)) {
                 String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED));
@@ -233,7 +233,7 @@ public class ConfigClientsHelper extends HelperBase {
            .append(_("Control")).append("</th><th align=\"left\">")
            .append(_("Description")).append("</th></tr>\n");
         Properties props = PluginStarter.pluginProperties();
-        Set<String> keys = new TreeSet(props.keySet());
+        Set<String> keys = new TreeSet<String>(props.stringPropertyNames());
         for (String name : keys) {
             if (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED)) {
                 String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
index 1e87c3bab..aa064e627 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
@@ -1,7 +1,6 @@
 package net.i2p.router.web;
 
 import java.util.List;
-import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
@@ -33,14 +32,12 @@ public class ConfigLoggingHelper extends HelperBase {
         StringBuilder buf = new StringBuilder(32*1024);
         Properties limits = _context.logManager().getLimits();
         TreeSet<String> sortedLogs = new TreeSet<String>();
-        for (Iterator iter = limits.keySet().iterator(); iter.hasNext(); ) {
-            String prefix = (String)iter.next();
+        for (String prefix : limits.stringPropertyNames()) {
             sortedLogs.add(prefix);
         }
         
         buf.append("<textarea name=\"levels\" rows=\"4\" cols=\"60\" wrap=\"off\" spellcheck=\"false\">");
-        for (Iterator iter = sortedLogs.iterator(); iter.hasNext(); ) {
-            String prefix = (String)iter.next();
+        for (String prefix : sortedLogs) {
             String level = limits.getProperty(prefix);
             buf.append(prefix).append('=').append(level).append('\n');
         }
@@ -97,7 +94,7 @@ public class ConfigLoggingHelper extends HelperBase {
      */
     public String getNewClassBox() {
         List<Log> logs = _context.logManager().getLogs();
-        Set limits = _context.logManager().getLimits().keySet();
+        Set<String> limits = _context.logManager().getLimits().stringPropertyNames();
         TreeSet<String> sortedLogs = new TreeSet<String>();
 
         for (Log log : logs) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
index c5467242c..d66c44777 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
@@ -1,6 +1,5 @@
 package net.i2p.router.web;
 
-import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
@@ -181,8 +180,7 @@ public class ConfigTunnelsHelper extends HelperBase {
                        "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
             buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
                        "value=\"");
-            for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
-                String prop = (String)iter.next();
+            for (String prop : props.stringPropertyNames()) {
                 String val = props.getProperty(prop);
                 buf.append(prop).append('=').append(val).append(' ');
             }
@@ -194,8 +192,7 @@ public class ConfigTunnelsHelper extends HelperBase {
                        "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
             buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
                        "value=\"");
-            for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
-                String prop = (String)iter.next();
+            for (String prop : props.stringPropertyNames()) {
                 String val = props.getProperty(prop);
                 buf.append(prop).append('=').append(val).append(' ');
             }