From ae79deff395fd14548442e288b60b4941746bc5f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 21 Nov 2013 10:13:34 +0000
Subject: [PATCH] net.i2p.jetty.*: type arguments, unused imports
---
apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java | 7 +++----
apps/jetty/java/src/net/i2p/jetty/JettyStart.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
index 77d9afa052..59f4a41cd5 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
@@ -32,7 +32,6 @@ import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.DateCache;
import org.eclipse.jetty.util.RolloverFileOutputStream;
import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.Utf8StringBuilder;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
import org.eclipse.jetty.util.log.Log;
@@ -83,7 +82,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
private transient DateCache _logDateCache;
private transient PathMap _ignorePathMap;
private transient Writer _writer;
- private transient ArrayList _buffers;
+ private transient ArrayList<Utf8StringBuilder> _buffers;
private transient char[] _copy;
@@ -262,7 +261,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
synchronized(_writer)
{
int size=_buffers.size();
- u8buf = size==0?new Utf8StringBuilder(160):(Utf8StringBuilder)_buffers.remove(size-1);
+ u8buf = size==0?new Utf8StringBuilder(160):_buffers.remove(size-1);
buf = u8buf.getStringBuilder();
}
@@ -467,7 +466,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
_ignorePathMap = null;
_writer = new OutputStreamWriter(_out);
- _buffers = new ArrayList();
+ _buffers = new ArrayList<Utf8StringBuilder>();
_copy = new char[1024];
super.doStart();
}
diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index 1a7daa2bae..5e54255f0d 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -57,7 +57,7 @@ public class JettyStart implements ClientApp {
_state = UNINITIALIZED;
_mgr = mgr;
_args = args;
- _jettys = new ArrayList(args.length);
+ _jettys = new ArrayList<LifeCycle>(args.length);
parseArgs(args);
_state = INITIALIZED;
}
--
GitLab