From d6bb5f6a4d30d0c07cb1653582d49938c8923823 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 22 Nov 2013 11:41:12 +0000
Subject: [PATCH] i2ptunnel: type arguments
---
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java | 2 +-
.../java/src/net/i2p/i2ptunnel/I2PTunnelServer.java | 2 +-
.../java/src/net/i2p/i2ptunnel/TunnelController.java | 8 ++++----
.../java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java | 2 +-
.../java/src/net/i2p/i2ptunnel/web/EditBean.java | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index e48a6bc569..9a8379111a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -366,7 +366,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
* @since 0.9.1
*/
public void setClientOptions(Properties opts) {
- for (Iterator iter = _clientOptions.keySet().iterator(); iter.hasNext();) {
+ for (Iterator<Object> iter = _clientOptions.keySet().iterator(); iter.hasNext();) {
Object key = iter.next();
if (!opts.containsKey(key))
iter.remove();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 8d5f4ff4ba..d246e61e16 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -365,7 +365,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
*/
private void buildSocketMap(Properties props) {
_socketMap.clear();
- for (Map.Entry e : props.entrySet()) {
+ for (Map.Entry<Object, Object> e : props.entrySet()) {
String key = (String) e.getKey();
if (key.startsWith("targetForPort.")) {
key = key.substring("targetForPort.".length());
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
index a02de79b26..1b1fdefcfa 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
@@ -413,7 +413,7 @@ public class TunnelController implements Logging {
*/
public Properties getClientOptionProps() {
Properties opts = new Properties();
- for (Map.Entry e : _config.entrySet()) {
+ for (Map.Entry<Object, Object> e : _config.entrySet()) {
String key = (String) e.getKey();
if (key.startsWith("option.")) {
key = key.substring("option.".length());
@@ -471,7 +471,7 @@ public class TunnelController implements Logging {
*/
public void setConfig(Properties config, String prefix) {
Properties props = new Properties();
- for (Map.Entry e : config.entrySet()) {
+ for (Map.Entry<Object, Object> e : config.entrySet()) {
String key = (String) e.getKey();
if (key.startsWith(prefix)) {
key = key.substring(prefix.length());
@@ -516,7 +516,7 @@ public class TunnelController implements Logging {
*/
public Properties getConfig(String prefix) {
Properties rv = new Properties();
- for (Map.Entry e : _config.entrySet()) {
+ for (Map.Entry<Object, Object> e : _config.entrySet()) {
String key = (String) e.getKey();
String val = (String) e.getValue();
rv.setProperty(prefix + key, val);
@@ -538,7 +538,7 @@ public class TunnelController implements Logging {
*/
public String getClientOptions() {
StringBuilder opts = new StringBuilder(64);
- for (Map.Entry e : _config.entrySet()) {
+ for (Map.Entry<Object, Object> e : _config.entrySet()) {
String key = (String) e.getKey();
if (key.startsWith("option.")) {
key = key.substring("option.".length());
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
index b66d613a8c..f6df4a56b5 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java
@@ -70,7 +70,7 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
private void parseOptions() {
Properties opts = getTunnel().getClientOptions();
proxies = new HashMap<String, List<String>>(1);
- for (Map.Entry e : opts.entrySet()) {
+ for (Map.Entry<Object, Object> e : opts.entrySet()) {
String prop = (String)e.getKey();
if ((!prop.startsWith(PROP_PROXY_PREFIX)) || prop.length() <= PROP_PROXY_PREFIX.length())
continue;
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index c3160b8419..6e917cf0c1 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -373,7 +373,7 @@ public class EditBean extends IndexBean {
boolean isMD5Proxy = "httpclient".equals(tun.getType()) ||
"connectclient".equals(tun.getType());
Map<String, String> sorted = new TreeMap<String, String>();
- for (Map.Entry e : opts.entrySet()) {
+ for (Map.Entry<Object, Object> e : opts.entrySet()) {
String key = (String)e.getKey();
if (_noShowSet.contains(key))
continue;
--
GitLab