echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2psnark: type arguments, unused imports, for each

Browse Source
This commit is contained in:
str4d
2013-11-26 00:20:03 +00:00
parent 0347c56c96
commit 2f33186e58
8 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
View File

@ -156,11 +156,11 @@ public class MetaInfo
if (val == null) { if (val == null) {
this.announce_list = null; this.announce_list = null;
} else { } else {
this.announce_list = new ArrayList(); this.announce_list = new ArrayList<List<String>>();
List<BEValue> bl1 = val.getList(); List<BEValue> bl1 = val.getList();
for (BEValue bev : bl1) { for (BEValue bev : bl1) {
List<BEValue> bl2 = bev.getList(); List<BEValue> bl2 = bev.getList();
List<String> sl2 = new ArrayList(); List<String> sl2 = new ArrayList<String>();
for (BEValue bev2 : bl2) { for (BEValue bev2 : bl2) {
sl2.add(bev2.getString()); sl2.add(bev2.getString());
} }
@ -259,9 +259,9 @@ public class MetaInfo
if (size == 0) if (size == 0)
throw new InvalidBEncodingException("zero size files list"); throw new InvalidBEncodingException("zero size files list");
List<List<String>> m_files = new ArrayList(size); List<List<String>> m_files = new ArrayList<List<String>>(size);
List<List<String>> m_files_utf8 = new ArrayList(size); List<List<String>> m_files_utf8 = new ArrayList<List<String>>(size);
List<Long> m_lengths = new ArrayList(size); List<Long> m_lengths = new ArrayList<Long>(size);
long l = 0; long l = 0;
for (int i = 0; i < list.size(); i++) for (int i = 0; i < list.size(); i++)
{ {
@ -287,7 +287,7 @@ public class MetaInfo
if (path_length == 0) if (path_length == 0)
throw new InvalidBEncodingException("zero size file path list"); throw new InvalidBEncodingException("zero size file path list");
List<String> file = new ArrayList(path_length); List<String> file = new ArrayList<String>(path_length);
Iterator<BEValue> it = path_list.iterator(); Iterator<BEValue> it = path_list.iterator();
while (it.hasNext()) { while (it.hasNext()) {
String s = it.next().getString(); String s = it.next().getString();
@ -310,7 +310,7 @@ public class MetaInfo
path_list = val.getList(); path_list = val.getList();
path_length = path_list.size(); path_length = path_list.size();
if (path_length > 0) { if (path_length > 0) {
file = new ArrayList(path_length); file = new ArrayList<String>(path_length);
it = path_list.iterator(); it = path_list.iterator();
while (it.hasNext()) while (it.hasNext())
file.add(it.next().getString()); file.add(it.next().getString());
@ -573,10 +573,10 @@ public class MetaInfo
*/ */
public MetaInfo reannounce(String announce) throws InvalidBEncodingException public MetaInfo reannounce(String announce) throws InvalidBEncodingException
{ {
Map<String, BEValue> m = new HashMap(); Map<String, BEValue> m = new HashMap<String, BEValue>();
if (announce != null) if (announce != null)
m.put("announce", new BEValue(DataHelper.getUTF8(announce))); m.put("announce", new BEValue(DataHelper.getUTF8(announce)));
Map info = createInfoMap(); Map<String, BEValue> info = createInfoMap();
m.put("info", new BEValue(info)); m.put("info", new BEValue(info));
return new MetaInfo(m); return new MetaInfo(m);
} }

6
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@ -425,7 +425,7 @@ public class SnarkManager implements CompleteListener {
String i2cpHost = _config.getProperty(PROP_I2CP_HOST); String i2cpHost = _config.getProperty(PROP_I2CP_HOST);
int i2cpPort = getInt(PROP_I2CP_PORT, 7654); int i2cpPort = getInt(PROP_I2CP_PORT, 7654);
String opts = _config.getProperty(PROP_I2CP_OPTS); String opts = _config.getProperty(PROP_I2CP_OPTS);
Map i2cpOpts = new HashMap(); Map<String, String> i2cpOpts = new HashMap<String, String>();
if (opts != null) { if (opts != null) {
StringTokenizer tok = new StringTokenizer(opts, " "); StringTokenizer tok = new StringTokenizer(opts, " ");
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {
@ -1653,7 +1653,7 @@ public class SnarkManager implements CompleteListener {
*/ */
private void monitorTorrents(File dir) { private void monitorTorrents(File dir) {
String fileNames[] = dir.list(TorrentFilenameFilter.instance()); String fileNames[] = dir.list(TorrentFilenameFilter.instance());
List<String> foundNames = new ArrayList(0); List<String> foundNames = new ArrayList<String>(0);
if (fileNames != null) { if (fileNames != null) {
for (int i = 0; i < fileNames.length; i++) { for (int i = 0; i < fileNames.length; i++) {
try { try {
@ -1740,7 +1740,7 @@ public class SnarkManager implements CompleteListener {
* @since 0.9.1 * @since 0.9.1
*/ */
public List<Tracker> getSortedTrackers() { public List<Tracker> getSortedTrackers() {
List<Tracker> rv = new ArrayList(_trackerMap.values()); List<Tracker> rv = new ArrayList<Tracker>(_trackerMap.values());
Collections.sort(rv, new IgnoreCaseComparator()); Collections.sort(rv, new IgnoreCaseComparator());
return rv; return rv;
} }

2
apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java
View File

@ -281,7 +281,7 @@ public class BDecoder
+ (char)c + "'"); + (char)c + "'");
indicator = 0; indicator = 0;
List result = new ArrayList(); List<BEValue> result = new ArrayList<BEValue>();
c = getNextIndicator(); c = getNextIndicator();
while (c != 'e') while (c != 'e')
{ {

2
apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java
View File

@ -175,7 +175,7 @@ public class BEncoder
// Keys must be sorted. XXX - But is this the correct order? // Keys must be sorted. XXX - But is this the correct order?
Set<String> s = m.keySet(); Set<String> s = m.keySet();
List<String> l = new ArrayList(s); List<String> l = new ArrayList<String>(s);
Collections.sort(l); Collections.sort(l);
Iterator<String> it = l.iterator(); Iterator<String> it = l.iterator();

3
apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
View File

@ -27,7 +27,6 @@ import java.util.Enumeration;
import java.util.List; import java.util.List;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.UnavailableException; import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
@ -325,7 +324,7 @@ class BasicServlet extends HttpServlet
long content_length = content.getContentLength(); long content_length = content.getContentLength();
// see if there are any range headers // see if there are any range headers
Enumeration reqRanges = request.getHeaders("Range"); Enumeration<?> reqRanges = request.getHeaders("Range");
if (reqRanges == null || !reqRanges.hasMoreElements()) { if (reqRanges == null || !reqRanges.hasMoreElements()) {
// if there were no ranges, send entire entity // if there were no ranges, send entire entity

47
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -1,12 +1,8 @@
package org.klomp.snark.web; package org.klomp.snark.web;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.text.Collator; import java.text.Collator;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -16,7 +12,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.Enumeration; import java.util.Enumeration;
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;
@ -26,14 +21,11 @@ import java.util.TreeSet;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import net.i2p.I2PAppContext;
import net.i2p.data.Base64; import net.i2p.data.Base64;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
import org.klomp.snark.I2PSnarkUtil; import org.klomp.snark.I2PSnarkUtil;
@ -758,8 +750,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (torrent != null) { if (torrent != null) {
byte infoHash[] = Base64.decode(torrent); byte infoHash[] = Base64.decode(torrent);
if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { for (String name : _manager.listTorrentFiles() ) {
String name = (String)iter.next();
Snark snark = _manager.getTorrent(name); Snark snark = _manager.getTorrent(name);
if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) {
_manager.stopTorrent(snark, false); _manager.stopTorrent(snark, false);
@ -781,8 +772,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (torrent != null) { if (torrent != null) {
byte infoHash[] = Base64.decode(torrent); byte infoHash[] = Base64.decode(torrent);
if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { for (String name : _manager.listTorrentFiles() ) {
String name = (String)iter.next();
Snark snark = _manager.getTorrent(name); Snark snark = _manager.getTorrent(name);
if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) {
MetaInfo meta = snark.getMetaInfo(); MetaInfo meta = snark.getMetaInfo();
@ -809,8 +799,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (torrent != null) { if (torrent != null) {
byte infoHash[] = Base64.decode(torrent); byte infoHash[] = Base64.decode(torrent);
if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1
for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { for (String name : _manager.listTorrentFiles() ) {
String name = (String)iter.next();
Snark snark = _manager.getTorrent(name); Snark snark = _manager.getTorrent(name);
if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) {
MetaInfo meta = snark.getMetaInfo(); MetaInfo meta = snark.getMetaInfo();
@ -849,7 +838,7 @@ public class I2PSnarkServlet extends BasicServlet {
} }
} }
// step 2 make Set of dirs with reverse sort // step 2 make Set of dirs with reverse sort
Set<File> dirs = new TreeSet(Collections.reverseOrder()); Set<File> dirs = new TreeSet<File>(Collections.reverseOrder());
for (List<String> list : files) { for (List<String> list : files) {
for (int i = 1; i < list.size(); i++) { for (int i = 1; i < list.size(); i++) {
dirs.add(Storage.getFileFromNames(f, list.subList(0, i))); dirs.add(Storage.getFileFromNames(f, list.subList(0, i)));
@ -922,8 +911,8 @@ public class I2PSnarkServlet extends BasicServlet {
if (announceURL.equals("none")) if (announceURL.equals("none"))
announceURL = null; announceURL = null;
_lastAnnounceURL = announceURL; _lastAnnounceURL = announceURL;
List<String> backupURLs = new ArrayList(); List<String> backupURLs = new ArrayList<String>();
Enumeration e = req.getParameterNames(); Enumeration<?> e = req.getParameterNames();
while (e.hasMoreElements()) { while (e.hasMoreElements()) {
Object o = e.nextElement(); Object o = e.nextElement();
if (!(o instanceof String)) 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")); _manager.addMessage(_("Error - Cannot mix private and public trackers in a torrent"));
return; return;
} }
announceList = new ArrayList(backupURLs.size()); announceList = new ArrayList<List<String>>(backupURLs.size());
for (String url : backupURLs) { for (String url : backupURLs) {
announceList.add(Collections.singletonList(url)); announceList.add(Collections.singletonList(url));
} }
@ -1017,10 +1006,10 @@ public class I2PSnarkServlet extends BasicServlet {
if (action.equals(_("Delete selected")) || action.equals(_("Save tracker configuration"))) { if (action.equals(_("Delete selected")) || action.equals(_("Save tracker configuration"))) {
boolean changed = false; boolean changed = false;
Map<String, Tracker> trackers = _manager.getTrackerMap(); Map<String, Tracker> trackers = _manager.getTrackerMap();
List<String> removed = new ArrayList(); List<String> removed = new ArrayList<String>();
List<String> open = new ArrayList(); List<String> open = new ArrayList<String>();
List<String> priv = new ArrayList(); List<String> priv = new ArrayList<String>();
Enumeration e = req.getParameterNames(); Enumeration<?> e = req.getParameterNames();
while (e.hasMoreElements()) { while (e.hasMoreElements()) {
Object o = e.nextElement(); Object o = e.nextElement();
if (!(o instanceof String)) if (!(o instanceof String))
@ -1045,7 +1034,7 @@ public class I2PSnarkServlet extends BasicServlet {
} }
open.removeAll(removed); open.removeAll(removed);
List<String> oldOpen = new ArrayList(_manager.util().getOpenTrackers()); List<String> oldOpen = new ArrayList<String>(_manager.util().getOpenTrackers());
Collections.sort(oldOpen); Collections.sort(oldOpen);
Collections.sort(open); Collections.sort(open);
if (!open.equals(oldOpen)) if (!open.equals(oldOpen))
@ -1054,7 +1043,7 @@ public class I2PSnarkServlet extends BasicServlet {
priv.removeAll(removed); priv.removeAll(removed);
// open trumps private // open trumps private
priv.removeAll(open); priv.removeAll(open);
List<String> oldPriv = new ArrayList(_manager.getPrivateTrackers()); List<String> oldPriv = new ArrayList<String>(_manager.getPrivateTrackers());
Collections.sort(oldPriv); Collections.sort(oldPriv);
Collections.sort(priv); Collections.sort(priv);
if (!priv.equals(oldPriv)) if (!priv.equals(oldPriv))
@ -1074,11 +1063,11 @@ public class I2PSnarkServlet extends BasicServlet {
_manager.saveTrackerMap(); _manager.saveTrackerMap();
// open trumps private // open trumps private
if (req.getParameter("_add_open_") != null) { if (req.getParameter("_add_open_") != null) {
List newOpen = new ArrayList(_manager.util().getOpenTrackers()); List<String> newOpen = new ArrayList<String>(_manager.util().getOpenTrackers());
newOpen.add(aurl); newOpen.add(aurl);
_manager.saveOpenTrackers(newOpen); _manager.saveOpenTrackers(newOpen);
} else if (req.getParameter("_add_private_") != null) { } else if (req.getParameter("_add_private_") != null) {
List newPriv = new ArrayList(_manager.getPrivateTrackers()); List<String> newPriv = new ArrayList<String>(_manager.getPrivateTrackers());
newPriv.add(aurl); newPriv.add(aurl);
_manager.savePrivateTrackers(newPriv); _manager.savePrivateTrackers(newPriv);
} }
@ -1141,7 +1130,7 @@ public class I2PSnarkServlet extends BasicServlet {
} }
private List<Snark> getSortedSnarks(HttpServletRequest req) { private List<Snark> getSortedSnarks(HttpServletRequest req) {
ArrayList<Snark> rv = new ArrayList(_manager.getTorrents()); ArrayList<Snark> rv = new ArrayList<Snark>(_manager.getTorrents());
Collections.sort(rv, new TorrentNameComparator()); Collections.sort(rv, new TorrentNameComparator());
return rv; return rv;
} }
@ -1916,7 +1905,7 @@ public class I2PSnarkServlet extends BasicServlet {
//out.write("port: <input type=\"text\" name=\"eepPort\" value=\"" //out.write("port: <input type=\"text\" name=\"eepPort\" value=\""
// + _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br>\n"); // + _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br>\n");
Map<String, String> options = new TreeMap(_manager.util().getI2CPOptions()); Map<String, String> options = new TreeMap<String, String>(_manager.util().getI2CPOptions());
out.write("<tr><td>"); out.write("<tr><td>");
out.write(_("Inbound Settings")); out.write(_("Inbound Settings"));
out.write(":<td>"); out.write(":<td>");
@ -2388,7 +2377,7 @@ public class I2PSnarkServlet extends BasicServlet {
.append(":</b> ") .append(":</b> ")
.append(formatSize(needed)); .append(formatSize(needed));
if (meta != null) { if (meta != null) {
List files = meta.getFiles(); List<List<String>> files = meta.getFiles();
int fileCount = files != null ? files.size() : 1; int fileCount = files != null ? files.size() : 1;
buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" >&nbsp;<b>") buf.append("&nbsp;<img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" >&nbsp;<b>")
.append(_("Files")) .append(_("Files"))

4
apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java
View File

@ -73,7 +73,7 @@ public class InclusiveByteRange
* @param size Size of the resource. * @param size Size of the resource.
* @return List of satisfiable ranges * @return List of satisfiable ranges
*/ */
public static List<InclusiveByteRange> satisfiableRanges(Enumeration headers, long size) public static List<InclusiveByteRange> satisfiableRanges(Enumeration<?> headers, long size)
{ {
List<InclusiveByteRange> satRanges = null; List<InclusiveByteRange> satRanges = null;
@ -128,7 +128,7 @@ public class InclusiveByteRange
if (first < size) if (first < size)
{ {
if (satRanges == null) if (satRanges == null)
satRanges = new ArrayList(4); satRanges = new ArrayList<InclusiveByteRange>(4);
InclusiveByteRange range = new InclusiveByteRange(first,last); InclusiveByteRange range = new InclusiveByteRange(first,last);
satRanges.add(range); satRanges.add(range);
} }

4
apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java
View File

@ -21,8 +21,6 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletContext;
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/** /**
@ -48,7 +46,7 @@ class MimeTypes
private final Map<String, String> _mimeMap; private final Map<String, String> _mimeMap;
public MimeTypes() { public MimeTypes() {
_mimeMap = new ConcurrentHashMap(); _mimeMap = new ConcurrentHashMap<String, String>();
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */