lint unchecked

This commit is contained in:
zzz
2015-04-24 16:27:03 +00:00
parent aecc95825b
commit 81ad33d9e3
5 changed files with 12 additions and 21 deletions

View File

@ -55,7 +55,7 @@ public class ConfigAdvancedHandler extends FormHandler {
return; return;
} }
for (Object key : props.keySet()) { for (String key : props.stringPropertyNames()) {
unsetKeys.remove(key); unsetKeys.remove(key);
} }

View File

@ -8,7 +8,6 @@ import java.io.OutputStream;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -346,9 +345,8 @@ public class ConfigClientsHandler extends FormHandler {
private void saveWebAppChanges() { private void saveWebAppChanges() {
Properties props = RouterConsoleRunner.webAppProperties(_context); Properties props = RouterConsoleRunner.webAppProperties(_context);
Set keys = props.keySet(); Set<String> keys = props.stringPropertyNames();
for (Iterator iter = keys.iterator(); iter.hasNext(); ) { for (String name : keys) {
String name = (String)iter.next();
if (! (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED))) if (! (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)))
continue; continue;
String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED)); String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(RouterConsoleRunner.ENABLED));
@ -362,9 +360,8 @@ public class ConfigClientsHandler extends FormHandler {
private void savePluginChanges() { private void savePluginChanges() {
Properties props = PluginStarter.pluginProperties(); Properties props = PluginStarter.pluginProperties();
Set keys = props.keySet(); Set<String> keys = props.stringPropertyNames();
for (Iterator iter = keys.iterator(); iter.hasNext(); ) { for (String name : keys) {
String name = (String)iter.next();
if (! (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED))) if (! (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED)))
continue; continue;
String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED)); String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED));

View File

@ -204,7 +204,7 @@ public class ConfigClientsHelper extends HelperBase {
.append(_("Control")).append("</th><th align=\"left\">") .append(_("Control")).append("</th><th align=\"left\">")
.append(_("Description")).append("</th></tr>\n"); .append(_("Description")).append("</th></tr>\n");
Properties props = RouterConsoleRunner.webAppProperties(_context); Properties props = RouterConsoleRunner.webAppProperties(_context);
Set<String> keys = new TreeSet(props.keySet()); Set<String> keys = new TreeSet<String>(props.stringPropertyNames());
for (String name : keys) { for (String name : keys) {
if (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)) { if (name.startsWith(RouterConsoleRunner.PREFIX) && name.endsWith(RouterConsoleRunner.ENABLED)) {
String app = name.substring(RouterConsoleRunner.PREFIX.length(), name.lastIndexOf(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(_("Control")).append("</th><th align=\"left\">")
.append(_("Description")).append("</th></tr>\n"); .append(_("Description")).append("</th></tr>\n");
Properties props = PluginStarter.pluginProperties(); Properties props = PluginStarter.pluginProperties();
Set<String> keys = new TreeSet(props.keySet()); Set<String> keys = new TreeSet<String>(props.stringPropertyNames());
for (String name : keys) { for (String name : keys) {
if (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED)) { if (name.startsWith(PluginStarter.PREFIX) && name.endsWith(PluginStarter.ENABLED)) {
String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED)); String app = name.substring(PluginStarter.PREFIX.length(), name.lastIndexOf(PluginStarter.ENABLED));

View File

@ -1,7 +1,6 @@
package net.i2p.router.web; package net.i2p.router.web;
import java.util.List; import java.util.List;
import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
@ -33,14 +32,12 @@ public class ConfigLoggingHelper extends HelperBase {
StringBuilder buf = new StringBuilder(32*1024); StringBuilder buf = new StringBuilder(32*1024);
Properties limits = _context.logManager().getLimits(); Properties limits = _context.logManager().getLimits();
TreeSet<String> sortedLogs = new TreeSet<String>(); TreeSet<String> sortedLogs = new TreeSet<String>();
for (Iterator iter = limits.keySet().iterator(); iter.hasNext(); ) { for (String prefix : limits.stringPropertyNames()) {
String prefix = (String)iter.next();
sortedLogs.add(prefix); sortedLogs.add(prefix);
} }
buf.append("<textarea name=\"levels\" rows=\"4\" cols=\"60\" wrap=\"off\" spellcheck=\"false\">"); buf.append("<textarea name=\"levels\" rows=\"4\" cols=\"60\" wrap=\"off\" spellcheck=\"false\">");
for (Iterator iter = sortedLogs.iterator(); iter.hasNext(); ) { for (String prefix : sortedLogs) {
String prefix = (String)iter.next();
String level = limits.getProperty(prefix); String level = limits.getProperty(prefix);
buf.append(prefix).append('=').append(level).append('\n'); buf.append(prefix).append('=').append(level).append('\n');
} }
@ -97,7 +94,7 @@ public class ConfigLoggingHelper extends HelperBase {
*/ */
public String getNewClassBox() { public String getNewClassBox() {
List<Log> logs = _context.logManager().getLogs(); 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>(); TreeSet<String> sortedLogs = new TreeSet<String>();
for (Log log : logs) { for (Log log : logs) {

View File

@ -1,6 +1,5 @@
package net.i2p.router.web; package net.i2p.router.web;
import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
@ -181,8 +180,7 @@ public class ConfigTunnelsHelper extends HelperBase {
"<td colspan=\"2\" align=\"center\"><input name=\"").append(index); "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " + buf.append(".inboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
"value=\""); "value=\"");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) { for (String prop : props.stringPropertyNames()) {
String prop = (String)iter.next();
String val = props.getProperty(prop); String val = props.getProperty(prop);
buf.append(prop).append('=').append(val).append(' '); 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); "<td colspan=\"2\" align=\"center\"><input name=\"").append(index);
buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " + buf.append(".outboundOptions\" type=\"text\" size=\"32\" disabled=\"disabled\" " +
"value=\""); "value=\"");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) { for (String prop : props.stringPropertyNames()) {
String prop = (String)iter.next();
String val = props.getProperty(prop); String val = props.getProperty(prop);
buf.append(prop).append('=').append(val).append(' '); buf.append(prop).append('=').append(val).append(' ');
} }