From 15bf94b479d5c7ee62f51cd9e0cd6607dd21544f Mon Sep 17 00:00:00 2001 From: str4d Date: Fri, 22 Nov 2013 09:34:42 +0000 Subject: [PATCH] Core: type arguments --- .../java/src/net/i2p/router/web/NetDbRenderer.java | 8 ++++---- core/java/src/net/i2p/I2PAppContext.java | 7 ++++--- core/java/src/net/i2p/data/DataHelper.java | 10 +++++----- core/java/src/net/i2p/data/PrivateKeyFile.java | 4 +--- core/java/src/net/i2p/data/RouterAddress.java | 4 ++-- core/java/src/net/i2p/data/RouterInfo.java | 4 ++-- core/java/src/net/i2p/data/i2cp/SessionConfig.java | 2 +- core/java/src/net/i2p/util/LogManager.java | 4 ++-- core/java/src/net/i2p/util/OrderedProperties.java | 10 +++++----- .../i2p/client/naming/BlockfileNamingServiceTest.java | 6 ++++-- 10 files changed, 30 insertions(+), 29 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java index 5dafe42a5..7fd1a30c7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbRenderer.java @@ -418,8 +418,8 @@ public class NetDbRenderer { int cost = addr.getCost(); if (!((style.equals("SSU") && cost == 5) || (style.equals("NTCP") && cost == 10))) buf.append('[').append(_("cost")).append('=').append("" + cost).append("] "); - Map p = addr.getOptionsMap(); - for (Map.Entry e : (Set) p.entrySet()) { + Map p = addr.getOptionsMap(); + for (Map.Entry e : p.entrySet()) { String name = (String) e.getKey(); String val = (String) e.getValue(); buf.append('[').append(_(DataHelper.stripHTML(name))).append('=').append(DataHelper.stripHTML(val)).append("] "); @@ -428,8 +428,8 @@ public class NetDbRenderer { buf.append("\n"); if (full) { buf.append("" + _("Stats") + ":
"); - Map p = info.getOptionsMap(); - for (Map.Entry e : (Set) p.entrySet()) { + Map p = info.getOptionsMap(); + for (Map.Entry e : p.entrySet()) { String key = (String) e.getKey(); String val = (String) e.getValue(); buf.append(DataHelper.stripHTML(key)).append(" = ").append(DataHelper.stripHTML(val)).append("
\n"); diff --git a/core/java/src/net/i2p/I2PAppContext.java b/core/java/src/net/i2p/I2PAppContext.java index 9a45598f4..46cfc3742 100644 --- a/core/java/src/net/i2p/I2PAppContext.java +++ b/core/java/src/net/i2p/I2PAppContext.java @@ -535,11 +535,12 @@ public class I2PAppContext { * * @return set of Strings containing the names of defined system properties */ - public Set getPropertyNames() { + @SuppressWarnings({ "unchecked", "rawtypes" }) + public Set getPropertyNames() { // clone to avoid ConcurrentModificationException - Set names = new HashSet(((Properties) System.getProperties().clone()).keySet()); + Set names = new HashSet((Set) (Set) ((Properties) System.getProperties().clone()).keySet()); // TODO-Java6: s/keySet()/stringPropertyNames()/ if (_overrideProps != null) - names.addAll(_overrideProps.keySet()); + names.addAll((Set) (Set) _overrideProps.keySet()); // TODO-Java6: s/keySet()/stringPropertyNames()/ return names; } diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java index 83fe675ff..e2400a67a 100644 --- a/core/java/src/net/i2p/data/DataHelper.java +++ b/core/java/src/net/i2p/data/DataHelper.java @@ -226,7 +226,7 @@ public class DataHelper { p = props; } ByteArrayOutputStream baos = new ByteArrayOutputStream(p.size() * 64); - for (Map.Entry entry : p.entrySet()) { + for (Map.Entry entry : p.entrySet()) { String key = (String) entry.getKey(); String val = (String) entry.getValue(); if (utf8) @@ -273,7 +273,7 @@ public class DataHelper { OrderedProperties p = new OrderedProperties(); p.putAll(props); ByteArrayOutputStream baos = new ByteArrayOutputStream(p.size() * 64); - for (Map.Entry entry : p.entrySet()) { + for (Map.Entry entry : p.entrySet()) { String key = (String) entry.getKey(); String val = (String) entry.getValue(); writeStringUTF8(baos, key); @@ -367,7 +367,7 @@ public class DataHelper { * (unless the options param is an OrderedProperties) */ public static String toString(Properties options) { - return toString((Map) options); + return toString((Map) options); } /** @@ -378,7 +378,7 @@ public class DataHelper { public static String toString(Map options) { StringBuilder buf = new StringBuilder(); if (options != null) { - for (Map.Entry entry : options.entrySet()) { + for (Map.Entry entry : options.entrySet()) { String key = (String) entry.getKey(); String val = (String) entry.getValue(); buf.append("[").append(key).append("] = [").append(val).append("]"); @@ -470,7 +470,7 @@ public class DataHelper { try { out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8"))); out.println("# NOTE: This I2P config file must use UTF-8 encoding"); - for (Map.Entry entry : props.entrySet()) { + for (Map.Entry entry : props.entrySet()) { String name = (String) entry.getKey(); String val = (String) entry.getValue(); if (name.contains("#") || diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java index 2808f9a69..f2535f6fe 100644 --- a/core/java/src/net/i2p/data/PrivateKeyFile.java +++ b/core/java/src/net/i2p/data/PrivateKeyFile.java @@ -6,7 +6,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -402,8 +401,7 @@ public class PrivateKeyFile { System.out.println("Attempting to verify using " + sz + " hosts, this may take a while"); } - for (Iterator iter = hosts.entrySet().iterator(); iter.hasNext(); ) { - Map.Entry entry = (Map.Entry)iter.next(); + for (Map.Entry entry : hosts.entrySet()) { String s = (String) entry.getValue(); Destination signer = new Destination(s); // make it go faster if we have the signerHash hint diff --git a/core/java/src/net/i2p/data/RouterAddress.java b/core/java/src/net/i2p/data/RouterAddress.java index 0b6fde6e0..4cdf3c554 100644 --- a/core/java/src/net/i2p/data/RouterAddress.java +++ b/core/java/src/net/i2p/data/RouterAddress.java @@ -157,7 +157,7 @@ public class RouterAddress extends DataStructureImpl { * @return an unmodifiable view, non-null, sorted * @since 0.8.13 */ - public Map getOptionsMap() { + public Map getOptionsMap() { return Collections.unmodifiableMap(_options); } @@ -324,7 +324,7 @@ public class RouterAddress extends DataStructureImpl { buf.append("\n\tCost: ").append(_cost); //buf.append("\n\tExpiration: ").append(_expiration); buf.append("\n\tOptions (").append(_options.size()).append("):"); - for (Map.Entry e : _options.entrySet()) { + for (Map.Entry e : _options.entrySet()) { String key = (String) e.getKey(); String val = (String) e.getValue(); buf.append("\n\t\t[").append(key).append("] = [").append(val).append("]"); diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java index 72b54b8a9..214937815 100644 --- a/core/java/src/net/i2p/data/RouterInfo.java +++ b/core/java/src/net/i2p/data/RouterInfo.java @@ -244,7 +244,7 @@ public class RouterInfo extends DatabaseEntry { * @return an unmodifiable view, non-null, sorted * @since 0.8.13 */ - public Map getOptionsMap() { + public Map getOptionsMap() { return Collections.unmodifiableMap(_options); } @@ -626,7 +626,7 @@ public class RouterInfo extends DatabaseEntry { } } buf.append("\n\tOptions (").append(_options.size()).append("):"); - for (Map.Entry e : _options.entrySet()) { + for (Map.Entry e : _options.entrySet()) { String key = (String) e.getKey(); String val = (String) e.getValue(); buf.append("\n\t\t[").append(key).append("] = [").append(val).append("]"); diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java index ee5f89873..cd6db38e4 100644 --- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java +++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java @@ -225,7 +225,7 @@ public class SessionConfig extends DataStructureImpl { buf.append("\n\tOptions: #: ").append(_options.size()); Properties sorted = new OrderedProperties(); sorted.putAll(_options); - for (Map.Entry e : sorted.entrySet()) { + for (Map.Entry e : sorted.entrySet()) { String key = (String) e.getKey(); String val = (String) e.getValue(); buf.append("\n\t\t[").append(key).append("] = [").append(val).append("]"); diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java index bb348229d..f9a98757f 100644 --- a/core/java/src/net/i2p/util/LogManager.java +++ b/core/java/src/net/i2p/util/LogManager.java @@ -186,7 +186,7 @@ public class LogManager { /** now used by ConfigLogingHelper */ public List getLogs() { - return new ArrayList(_logs.values()); + return new ArrayList(_logs.values()); } /** @@ -407,7 +407,7 @@ public class LogManager { private void parseLimits(Properties config, String recordPrefix) { _limits.clear(); if (config != null) { - for (Map.Entry e : config.entrySet()) { + for (Map.Entry e : config.entrySet()) { String key = (String) e.getKey(); // if we're filtering the records (e.g. logger.record.*) then diff --git a/core/java/src/net/i2p/util/OrderedProperties.java b/core/java/src/net/i2p/util/OrderedProperties.java index 56323f267..cce7b0e68 100644 --- a/core/java/src/net/i2p/util/OrderedProperties.java +++ b/core/java/src/net/i2p/util/OrderedProperties.java @@ -35,19 +35,19 @@ public class OrderedProperties extends Properties { } @Override - public Set keySet() { - return Collections.unmodifiableSortedSet(new TreeSet(super.keySet())); + public Set keySet() { + return Collections.unmodifiableSortedSet(new TreeSet(super.keySet())); } @Override public Set> entrySet() { - TreeSet> rv = new TreeSet(new EntryComparator()); + TreeSet> rv = new TreeSet>(new EntryComparator()); rv.addAll(super.entrySet()); return Collections.unmodifiableSortedSet(rv); } - private static class EntryComparator implements Comparator { - public int compare(Map.Entry l, Map.Entry r) { + private static class EntryComparator implements Comparator> { + public int compare(Map.Entry l, Map.Entry r) { return ((String)l.getKey()).compareTo(((String)r.getKey())); } } diff --git a/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java b/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java index 3a3603692..bc633934c 100644 --- a/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java +++ b/core/java/test/junit/net/i2p/client/naming/BlockfileNamingServiceTest.java @@ -11,6 +11,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Properties; +import java.util.Set; import net.i2p.I2PAppContext; import net.i2p.data.DataHelper; @@ -22,7 +23,8 @@ public class BlockfileNamingServiceTest extends TestCase { List _names; File hostsTxt, routerDir; - public void setUp() throws Exception { + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void setUp() throws Exception { I2PAppContext ctx = new I2PAppContext(); routerDir = ctx.getRouterDir(); @@ -31,7 +33,7 @@ public class BlockfileNamingServiceTest extends TestCase { Properties props = new Properties(); assertNotNull("test classpath not set correctly",is); DataHelper.loadProps(props, is, true); - _names = new ArrayList(props.keySet()); + _names = new ArrayList((Set) (Set) props.keySet()); // TODO-Java6: s/keySet()/stringPropertyNames()/ Collections.shuffle(_names); is.close();