Changeset 2f33186
- Timestamp:
- Nov 26, 2013 12:20:03 AM (7 years ago)
- Branches:
- master
- Children:
- 9804e5b
- Parents:
- 0347c56
- Location:
- apps/i2psnark/java/src/org/klomp/snark
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
r0347c56 r2f33186 157 157 this.announce_list = null; 158 158 } else { 159 this.announce_list = new ArrayList ();159 this.announce_list = new ArrayList<List<String>>(); 160 160 List<BEValue> bl1 = val.getList(); 161 161 for (BEValue bev : bl1) { 162 162 List<BEValue> bl2 = bev.getList(); 163 List<String> sl2 = new ArrayList ();163 List<String> sl2 = new ArrayList<String>(); 164 164 for (BEValue bev2 : bl2) { 165 165 sl2.add(bev2.getString()); … … 260 260 throw new InvalidBEncodingException("zero size files list"); 261 261 262 List<List<String>> m_files = new ArrayList (size);263 List<List<String>> m_files_utf8 = new ArrayList (size);264 List<Long> m_lengths = new ArrayList (size);262 List<List<String>> m_files = new ArrayList<List<String>>(size); 263 List<List<String>> m_files_utf8 = new ArrayList<List<String>>(size); 264 List<Long> m_lengths = new ArrayList<Long>(size); 265 265 long l = 0; 266 266 for (int i = 0; i < list.size(); i++) … … 288 288 throw new InvalidBEncodingException("zero size file path list"); 289 289 290 List<String> file = new ArrayList (path_length);290 List<String> file = new ArrayList<String>(path_length); 291 291 Iterator<BEValue> it = path_list.iterator(); 292 292 while (it.hasNext()) { … … 311 311 path_length = path_list.size(); 312 312 if (path_length > 0) { 313 file = new ArrayList (path_length);313 file = new ArrayList<String>(path_length); 314 314 it = path_list.iterator(); 315 315 while (it.hasNext()) … … 574 574 public MetaInfo reannounce(String announce) throws InvalidBEncodingException 575 575 { 576 Map<String, BEValue> m = new HashMap ();576 Map<String, BEValue> m = new HashMap<String, BEValue>(); 577 577 if (announce != null) 578 578 m.put("announce", new BEValue(DataHelper.getUTF8(announce))); 579 Map info = createInfoMap();579 Map<String, BEValue> info = createInfoMap(); 580 580 m.put("info", new BEValue(info)); 581 581 return new MetaInfo(m); -
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
r0347c56 r2f33186 426 426 int i2cpPort = getInt(PROP_I2CP_PORT, 7654); 427 427 String opts = _config.getProperty(PROP_I2CP_OPTS); 428 Map i2cpOpts = new HashMap();428 Map<String, String> i2cpOpts = new HashMap<String, String>(); 429 429 if (opts != null) { 430 430 StringTokenizer tok = new StringTokenizer(opts, " "); … … 1654 1654 private void monitorTorrents(File dir) { 1655 1655 String fileNames[] = dir.list(TorrentFilenameFilter.instance()); 1656 List<String> foundNames = new ArrayList (0);1656 List<String> foundNames = new ArrayList<String>(0); 1657 1657 if (fileNames != null) { 1658 1658 for (int i = 0; i < fileNames.length; i++) { … … 1741 1741 */ 1742 1742 public List<Tracker> getSortedTrackers() { 1743 List<Tracker> rv = new ArrayList (_trackerMap.values());1743 List<Tracker> rv = new ArrayList<Tracker>(_trackerMap.values()); 1744 1744 Collections.sort(rv, new IgnoreCaseComparator()); 1745 1745 return rv; -
apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java
r0347c56 r2f33186 282 282 indicator = 0; 283 283 284 List result = new ArrayList();284 List<BEValue> result = new ArrayList<BEValue>(); 285 285 c = getNextIndicator(); 286 286 while (c != 'e') -
apps/i2psnark/java/src/org/klomp/snark/bencode/BEncoder.java
r0347c56 r2f33186 176 176 // Keys must be sorted. XXX - But is this the correct order? 177 177 Set<String> s = m.keySet(); 178 List<String> l = new ArrayList (s);178 List<String> l = new ArrayList<String>(s); 179 179 Collections.sort(l); 180 180 -
apps/i2psnark/java/src/org/klomp/snark/web/BasicServlet.java
r0347c56 r2f33186 28 28 29 29 import javax.servlet.ServletConfig; 30 import javax.servlet.ServletContext;31 30 import javax.servlet.ServletException; 32 31 import javax.servlet.UnavailableException; … … 326 325 327 326 // see if there are any range headers 328 Enumeration reqRanges = request.getHeaders("Range");327 Enumeration<?> reqRanges = request.getHeaders("Range"); 329 328 330 329 if (reqRanges == null || !reqRanges.hasMoreElements()) { -
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
r0347c56 r2f33186 2 2 3 3 import java.io.File; 4 import java.io.FileInputStream;5 4 import java.io.IOException; 6 5 import java.io.PrintWriter; 7 import java.io.UnsupportedEncodingException;8 import java.net.URI;9 import java.net.URISyntaxException;10 6 import java.text.Collator; 11 7 import java.text.DecimalFormat; … … 17 13 import java.util.Date; 18 14 import java.util.Enumeration; 19 import java.util.Iterator;20 15 import java.util.List; 21 16 import java.util.Locale; … … 27 22 import javax.servlet.ServletConfig; 28 23 import javax.servlet.ServletException; 29 import javax.servlet.http.HttpServlet;30 24 import javax.servlet.http.HttpServletRequest; 31 25 import javax.servlet.http.HttpServletResponse; 32 26 33 import net.i2p.I2PAppContext;34 27 import net.i2p.data.Base64; 35 28 import net.i2p.data.DataHelper; 36 import net.i2p.util.I2PAppThread;37 29 import net.i2p.util.Log; 38 30 … … 759 751 byte infoHash[] = Base64.decode(torrent); 760 752 if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 761 for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { 762 String name = (String)iter.next(); 753 for (String name : _manager.listTorrentFiles() ) { 763 754 Snark snark = _manager.getTorrent(name); 764 755 if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { … … 782 773 byte infoHash[] = Base64.decode(torrent); 783 774 if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 784 for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { 785 String name = (String)iter.next(); 775 for (String name : _manager.listTorrentFiles() ) { 786 776 Snark snark = _manager.getTorrent(name); 787 777 if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { … … 810 800 byte infoHash[] = Base64.decode(torrent); 811 801 if ( (infoHash != null) && (infoHash.length == 20) ) { // valid sha1 812 for (Iterator iter = _manager.listTorrentFiles().iterator(); iter.hasNext(); ) { 813 String name = (String)iter.next(); 802 for (String name : _manager.listTorrentFiles() ) { 814 803 Snark snark = _manager.getTorrent(name); 815 804 if ( (snark != null) && (DataHelper.eq(infoHash, snark.getInfoHash())) ) { … … 850 839 } 851 840 // step 2 make Set of dirs with reverse sort 852 Set<File> dirs = new TreeSet (Collections.reverseOrder());841 Set<File> dirs = new TreeSet<File>(Collections.reverseOrder()); 853 842 for (List<String> list : files) { 854 843 for (int i = 1; i < list.size(); i++) { … … 923 912 announceURL = null; 924 913 _lastAnnounceURL = announceURL; 925 List<String> backupURLs = new ArrayList ();926 Enumeration e = req.getParameterNames();914 List<String> backupURLs = new ArrayList<String>(); 915 Enumeration<?> e = req.getParameterNames(); 927 916 while (e.hasMoreElements()) { 928 917 Object o = e.nextElement(); … … 956 945 return; 957 946 } 958 announceList = new ArrayList (backupURLs.size());947 announceList = new ArrayList<List<String>>(backupURLs.size()); 959 948 for (String url : backupURLs) { 960 949 announceList.add(Collections.singletonList(url)); … … 1018 1007 boolean changed = false; 1019 1008 Map<String, Tracker> trackers = _manager.getTrackerMap(); 1020 List<String> removed = new ArrayList ();1021 List<String> open = new ArrayList ();1022 List<String> priv = new ArrayList ();1023 Enumeration e = req.getParameterNames();1009 List<String> removed = new ArrayList<String>(); 1010 List<String> open = new ArrayList<String>(); 1011 List<String> priv = new ArrayList<String>(); 1012 Enumeration<?> e = req.getParameterNames(); 1024 1013 while (e.hasMoreElements()) { 1025 1014 Object o = e.nextElement(); … … 1046 1035 1047 1036 open.removeAll(removed); 1048 List<String> oldOpen = new ArrayList (_manager.util().getOpenTrackers());1037 List<String> oldOpen = new ArrayList<String>(_manager.util().getOpenTrackers()); 1049 1038 Collections.sort(oldOpen); 1050 1039 Collections.sort(open); … … 1055 1044 // open trumps private 1056 1045 priv.removeAll(open); 1057 List<String> oldPriv = new ArrayList (_manager.getPrivateTrackers());1046 List<String> oldPriv = new ArrayList<String>(_manager.getPrivateTrackers()); 1058 1047 Collections.sort(oldPriv); 1059 1048 Collections.sort(priv); … … 1075 1064 // open trumps private 1076 1065 if (req.getParameter("_add_open_") != null) { 1077 List newOpen = new ArrayList(_manager.util().getOpenTrackers());1066 List<String> newOpen = new ArrayList<String>(_manager.util().getOpenTrackers()); 1078 1067 newOpen.add(aurl); 1079 1068 _manager.saveOpenTrackers(newOpen); 1080 1069 } else if (req.getParameter("_add_private_") != null) { 1081 List newPriv = new ArrayList(_manager.getPrivateTrackers());1070 List<String> newPriv = new ArrayList<String>(_manager.getPrivateTrackers()); 1082 1071 newPriv.add(aurl); 1083 1072 _manager.savePrivateTrackers(newPriv); … … 1142 1131 1143 1132 private List<Snark> getSortedSnarks(HttpServletRequest req) { 1144 ArrayList<Snark> rv = new ArrayList (_manager.getTorrents());1133 ArrayList<Snark> rv = new ArrayList<Snark>(_manager.getTorrents()); 1145 1134 Collections.sort(rv, new TorrentNameComparator()); 1146 1135 return rv; … … 1917 1906 // + _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br>\n"); 1918 1907 1919 Map<String, String> options = new TreeMap (_manager.util().getI2CPOptions());1908 Map<String, String> options = new TreeMap<String, String>(_manager.util().getI2CPOptions()); 1920 1909 out.write("<tr><td>"); 1921 1910 out.write(_("Inbound Settings")); … … 2389 2378 .append(formatSize(needed)); 2390 2379 if (meta != null) { 2391 List files = meta.getFiles();2380 List<List<String>> files = meta.getFiles(); 2392 2381 int fileCount = files != null ? files.size() : 1; 2393 2382 buf.append(" <img alt=\"\" border=\"0\" src=\"" + _imgPath + "file.png\" > <b>") -
apps/i2psnark/java/src/org/klomp/snark/web/InclusiveByteRange.java
r0347c56 r2f33186 74 74 * @return List of satisfiable ranges 75 75 */ 76 public static List<InclusiveByteRange> satisfiableRanges(Enumeration headers, long size)76 public static List<InclusiveByteRange> satisfiableRanges(Enumeration<?> headers, long size) 77 77 { 78 78 List<InclusiveByteRange> satRanges = null; … … 129 129 { 130 130 if (satRanges == null) 131 satRanges = new ArrayList (4);131 satRanges = new ArrayList<InclusiveByteRange>(4); 132 132 InclusiveByteRange range = new InclusiveByteRange(first,last); 133 133 satRanges.add(range); -
apps/i2psnark/java/src/org/klomp/snark/web/MimeTypes.java
r0347c56 r2f33186 21 21 import java.util.ResourceBundle; 22 22 import java.util.concurrent.ConcurrentHashMap; 23 24 import javax.servlet.ServletContext;25 23 26 24 … … 49 47 50 48 public MimeTypes() { 51 _mimeMap = new ConcurrentHashMap ();49 _mimeMap = new ConcurrentHashMap<String, String>(); 52 50 } 53 51
Note: See TracChangeset
for help on using the changeset viewer.