diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java index 8ec5442dd..dd16ec8a9 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java +++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java @@ -156,11 +156,11 @@ public class MetaInfo if (val == null) { this.announce_list = null; } else { - this.announce_list = new ArrayList(); + this.announce_list = new ArrayList>(); List bl1 = val.getList(); for (BEValue bev : bl1) { List bl2 = bev.getList(); - List sl2 = new ArrayList(); + List sl2 = new ArrayList(); for (BEValue bev2 : bl2) { sl2.add(bev2.getString()); } @@ -259,9 +259,9 @@ public class MetaInfo if (size == 0) throw new InvalidBEncodingException("zero size files list"); - List> m_files = new ArrayList(size); - List> m_files_utf8 = new ArrayList(size); - List m_lengths = new ArrayList(size); + List> m_files = new ArrayList>(size); + List> m_files_utf8 = new ArrayList>(size); + List m_lengths = new ArrayList(size); long l = 0; for (int i = 0; i < list.size(); i++) { @@ -287,7 +287,7 @@ public class MetaInfo if (path_length == 0) throw new InvalidBEncodingException("zero size file path list"); - List file = new ArrayList(path_length); + List file = new ArrayList(path_length); Iterator it = path_list.iterator(); while (it.hasNext()) { String s = it.next().getString(); @@ -310,7 +310,7 @@ public class MetaInfo path_list = val.getList(); path_length = path_list.size(); if (path_length > 0) { - file = new ArrayList(path_length); + file = new ArrayList(path_length); it = path_list.iterator(); while (it.hasNext()) file.add(it.next().getString()); @@ -573,10 +573,10 @@ public class MetaInfo */ public MetaInfo reannounce(String announce) throws InvalidBEncodingException { - Map m = new HashMap(); + Map m = new HashMap(); if (announce != null) m.put("announce", new BEValue(DataHelper.getUTF8(announce))); - Map info = createInfoMap(); + Map info = createInfoMap(); m.put("info", new BEValue(info)); return new MetaInfo(m); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index c245c97a0..d6e00f797 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -425,7 +425,7 @@ public class SnarkManager implements CompleteListener { String i2cpHost = _config.getProperty(PROP_I2CP_HOST); int i2cpPort = getInt(PROP_I2CP_PORT, 7654); String opts = _config.getProperty(PROP_I2CP_OPTS); - Map i2cpOpts = new HashMap(); + Map i2cpOpts = new HashMap(); if (opts != null) { StringTokenizer tok = new StringTokenizer(opts, " "); while (tok.hasMoreTokens()) { @@ -1653,7 +1653,7 @@ public class SnarkManager implements CompleteListener { */ private void monitorTorrents(File dir) { String fileNames[] = dir.list(TorrentFilenameFilter.instance()); - List foundNames = new ArrayList(0); + List foundNames = new ArrayList(0); if (fileNames != null) { for (int i = 0; i < fileNames.length; i++) { try { @@ -1740,7 +1740,7 @@ public class SnarkManager implements CompleteListener { * @since 0.9.1 */ public List getSortedTrackers() { - List rv = new ArrayList(_trackerMap.values()); + List rv = new ArrayList(_trackerMap.values()); Collections.sort(rv, new IgnoreCaseComparator()); return rv; } diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java index 2dc4e57b1..db0081364 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java @@ -281,7 +281,7 @@ public class BDecoder + (char)c + "'"); indicator = 0; - List result = new ArrayList(); + List result = new ArrayList(); c = getNextIndicator(); while (c != 'e') { diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java index 9584b0d9d..5e8409344 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java @@ -175,7 +175,7 @@ public class BEncoder // Keys must be sorted. XXX - But is this the correct order? Set s = m.keySet(); - List l = new ArrayList(s); + List l = new ArrayList(s); Collections.sort(l); Iterator it = l.iterator(); diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java index 1383ff2bb..593f7e21d 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java @@ -27,7 +27,6 @@ import java.util.Enumeration; import java.util.List; import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.UnavailableException; import javax.servlet.http.HttpServlet; @@ -325,7 +324,7 @@ class BasicServlet extends HttpServlet long content_length = content.getContentLength(); // see if there are any range headers - Enumeration reqRanges = request.getHeaders("Range"); + Enumeration reqRanges = request.getHeaders("Range"); if (reqRanges == null || !reqRanges.hasMoreElements()) { // if there were no ranges, send entire entity diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index 222935c0a..bbec045e1 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -1,12 +1,8 @@ package org.klomp.snark.web; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.PrintWriter; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; import java.text.Collator; import java.text.DecimalFormat; import java.text.SimpleDateFormat; @@ -16,7 +12,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.Enumeration; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -26,14 +21,11 @@ import java.util.TreeSet; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; -import net.i2p.util.I2PAppThread; import net.i2p.util.Log; import org.klomp.snark.I2PSnarkUtil; @@ -758,8 +750,7 @@ public class I2PSnarkServlet extends BasicServlet { if (torrent != null) { byte infoHash[] = Base64.decode(torrent); if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 - for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { - String name = (String)iter.next(); + for (String name : _manager.listTorrentFiles() ) { Snark snark = _manager.getTorrent(name); if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { _manager.stopTorrent(snark, false); @@ -781,8 +772,7 @@ public class I2PSnarkServlet extends BasicServlet { if (torrent != null) { byte infoHash[] = Base64.decode(torrent); if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 - for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { - String name = (String)iter.next(); + for (String name : _manager.listTorrentFiles() ) { Snark snark = _manager.getTorrent(name); if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { MetaInfo meta = snark.getMetaInfo(); @@ -809,8 +799,7 @@ public class I2PSnarkServlet extends BasicServlet { if (torrent != null) { byte infoHash[] = Base64.decode(torrent); if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 - for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { - String name = (String)iter.next(); + for (String name : _manager.listTorrentFiles() ) { Snark snark = _manager.getTorrent(name); if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { MetaInfo meta = snark.getMetaInfo(); @@ -849,7 +838,7 @@ public class I2PSnarkServlet extends BasicServlet { } } // step 2 make Set of dirs with reverse sort - Set dirs = new TreeSet(Collections.reverseOrder()); + Set dirs = new TreeSet(Collections.reverseOrder()); for (List list : files) { for (int i = 1; i < list.size(); i++) { dirs.add(Storage.getFileFromNames(f, list.subList(0, i))); @@ -922,8 +911,8 @@ public class I2PSnarkServlet extends BasicServlet { if (announceURL.equals("none")) announceURL = null; _lastAnnounceURL = announceURL; - List backupURLs = new ArrayList(); - Enumeration e = req.getParameterNames(); + List backupURLs = new ArrayList(); + Enumeration e = req.getParameterNames(); while (e.hasMoreElements()) { Object o = e.nextElement(); if (!(o instanceof String)) @@ -955,7 +944,7 @@ public class I2PSnarkServlet extends BasicServlet { _manager.addMessage(_("Error - Cannot mix private and public trackers in a torrent")); return; } - announceList = new ArrayList(backupURLs.size()); + announceList = new ArrayList>(backupURLs.size()); for (String url : backupURLs) { announceList.add(Collections.singletonList(url)); } @@ -1017,10 +1006,10 @@ public class I2PSnarkServlet extends BasicServlet { if (action.equals(_("Delete selected")) || action.equals(_("Save tracker configuration"))) { boolean changed = false; Map trackers = _manager.getTrackerMap(); - List removed = new ArrayList(); - List open = new ArrayList(); - List priv = new ArrayList(); - Enumeration e = req.getParameterNames(); + List removed = new ArrayList(); + List open = new ArrayList(); + List priv = new ArrayList(); + Enumeration e = req.getParameterNames(); while (e.hasMoreElements()) { Object o = e.nextElement(); if (!(o instanceof String)) @@ -1045,7 +1034,7 @@ public class I2PSnarkServlet extends BasicServlet { } open.removeAll(removed); - List oldOpen = new ArrayList(_manager.util().getOpenTrackers()); + List oldOpen = new ArrayList(_manager.util().getOpenTrackers()); Collections.sort(oldOpen); Collections.sort(open); if (!open.equals(oldOpen)) @@ -1054,7 +1043,7 @@ public class I2PSnarkServlet extends BasicServlet { priv.removeAll(removed); // open trumps private priv.removeAll(open); - List oldPriv = new ArrayList(_manager.getPrivateTrackers()); + List oldPriv = new ArrayList(_manager.getPrivateTrackers()); Collections.sort(oldPriv); Collections.sort(priv); if (!priv.equals(oldPriv)) @@ -1074,11 +1063,11 @@ public class I2PSnarkServlet extends BasicServlet { _manager.saveTrackerMap(); // open trumps private if (req.getParameter("_add_open_") != null) { - List newOpen = new ArrayList(_manager.util().getOpenTrackers()); + List newOpen = new ArrayList(_manager.util().getOpenTrackers()); newOpen.add(aurl); _manager.saveOpenTrackers(newOpen); } else if (req.getParameter("_add_private_") != null) { - List newPriv = new ArrayList(_manager.getPrivateTrackers()); + List newPriv = new ArrayList(_manager.getPrivateTrackers()); newPriv.add(aurl); _manager.savePrivateTrackers(newPriv); } @@ -1141,7 +1130,7 @@ public class I2PSnarkServlet extends BasicServlet { } private List getSortedSnarks(HttpServletRequest req) { - ArrayList rv = new ArrayList(_manager.getTorrents()); + ArrayList rv = new ArrayList(_manager.getTorrents()); Collections.sort(rv, new TorrentNameComparator()); return rv; } @@ -1916,7 +1905,7 @@ public class I2PSnarkServlet extends BasicServlet { //out.write("port:
\n"); - Map options = new TreeMap(_manager.util().getI2CPOptions()); + Map options = new TreeMap(_manager.util().getI2CPOptions()); out.write(""); out.write(_("Inbound Settings")); out.write(":"); @@ -2388,7 +2377,7 @@ public class I2PSnarkServlet extends BasicServlet { .append(": ") .append(formatSize(needed)); if (meta != null) { - List files = meta.getFiles(); + List> files = meta.getFiles(); int fileCount = files != null ? files.size() : 1; buf.append(" \"\" ") .append(_("Files")) diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java b/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java index 17ae473a2..e71e5e3bc 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java @@ -73,7 +73,7 @@ public class InclusiveByteRange * @param size Size of the resource. * @return List of satisfiable ranges */ - public static List satisfiableRanges(Enumeration headers, long size) + public static List satisfiableRanges(Enumeration headers, long size) { List satRanges = null; @@ -128,7 +128,7 @@ public class InclusiveByteRange if (first < size) { if (satRanges == null) - satRanges = new ArrayList(4); + satRanges = new ArrayList(4); InclusiveByteRange range = new InclusiveByteRange(first,last); satRanges.add(range); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java b/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java index e24764ff5..f0b9af7df 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java @@ -21,8 +21,6 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.ServletContext; - /* ------------------------------------------------------------ */ /** @@ -48,7 +46,7 @@ class MimeTypes private final Map _mimeMap; public MimeTypes() { - _mimeMap = new ConcurrentHashMap(); + _mimeMap = new ConcurrentHashMap(); } /* ------------------------------------------------------------ */