Author: j16sdiz
Date: 2008-11-03 09:21:53 +0000 (Mon, 03 Nov 2008)
New Revision: 23290
Modified:
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java
Log:
generic, typo, enchanced-for loops, iternator optimization
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-11-02 20:54:30 UTC (rev 23289)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-11-03 09:21:53 UTC (rev 23290)
@@ -41,7 +41,7 @@
public abstract class ConnectionsToadlet extends Toadlet {
- protected class ComparatorByStatus implements Comparator {
+ protected class ComparatorByStatus implements
Comparator<PeerNodeStatus> {
protected final String sortBy;
protected final boolean reversed;
@@ -51,11 +51,9 @@
this.reversed = reversed;
}
- public int compare(Object first, Object second) {
+ public int compare(PeerNodeStatus firstNode, PeerNodeStatus
secondNode) {
int result = 0;
boolean isSet = true;
- PeerNodeStatus firstNode = (PeerNodeStatus) first;
- PeerNodeStatus secondNode = (PeerNodeStatus) second;
if(sortBy != null){
result = customCompare(firstNode, secondNode,
sortBy);
@@ -690,7 +688,7 @@
peerAdditionForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "submit", "add", l10n("add") });
}
- protected Comparator comparator(String sortBy, boolean reversed) {
+ protected Comparator<PeerNodeStatus> comparator(String sortBy, boolean
reversed) {
return new ComparatorByStatus(sortBy, reversed);
}
@@ -839,35 +837,35 @@
countHeaderRow.addChild("th", "Message");
countHeaderRow.addChild("th", "Incoming");
countHeaderRow.addChild("th", "Outgoing");
- List messageNames = new ArrayList();
- Map messageCounts = new HashMap();
- for (Iterator incomingMessages =
peerNodeStatus.getLocalMessagesReceived().keySet().iterator();
incomingMessages.hasNext(); ) {
- String messageName = (String) incomingMessages.next();
+ List<String> messageNames = new ArrayList<String>();
+ Map<String, Long[]> messageCounts = new HashMap<String,
Long[]>();
+ for (Map.Entry<String,Long> entry :
peerNodeStatus.getLocalMessagesReceived().entrySet() ) {
+ String messageName = entry.getKey();
+ Long messageCount = entry.getValue();
messageNames.add(messageName);
- Long messageCount = (Long)
peerNodeStatus.getLocalMessagesReceived().get(messageName);
messageCounts.put(messageName, new Long[] {
messageCount, new Long(0) });
}
- for (Iterator outgoingMessages =
peerNodeStatus.getLocalMessagesSent().keySet().iterator();
outgoingMessages.hasNext(); ) {
- String messageName = (String) outgoingMessages.next();
+ for (Map.Entry<String,Long> entry :
peerNodeStatus.getLocalMessagesSent().entrySet() ) {
+ String messageName = entry.getKey();
+ Long messageCount = entry.getValue();
if (!messageNames.contains(messageName)) {
messageNames.add(messageName);
}
- Long messageCount = (Long)
peerNodeStatus.getLocalMessagesSent().get(messageName);
- Long[] existingCounts = (Long[])
messageCounts.get(messageName);
+ Long[] existingCounts = messageCounts.get(messageName);
if (existingCounts == null) {
messageCounts.put(messageName, new Long[] { new
Long(0), messageCount });
} else {
existingCounts[1] = messageCount;
}
}
- Collections.sort(messageNames, new Comparator() {
- public int compare(Object first, Object second) {
- return ((String)
first).compareToIgnoreCase((String) second);
+ Collections.sort(messageNames, new Comparator<String>() {
+ public int compare(String first, String second) {
+ return first.compareToIgnoreCase(second);
}
});
- for (Iterator messageNamesIterator = messageNames.iterator();
messageNamesIterator.hasNext(); ) {
- String messageName = (String)
messageNamesIterator.next();
- Long[] messageCount = (Long[])
messageCounts.get(messageName);
+ for (Iterator<String> messageNamesIterator =
messageNames.iterator(); messageNamesIterator.hasNext(); ) {
+ String messageName = messageNamesIterator.next();
+ Long[] messageCount = messageCounts.get(messageName);
HTMLNode messageRow = messageCountTable.addChild("tr");
messageRow.addChild("td", messageName);
messageRow.addChild("td", "class", "right-align",
String.valueOf(messageCount[0]));
@@ -890,6 +888,4 @@
private String sortString(boolean isReversed, String type) {
return (isReversed ? ("?sortBy="+type) :
("?sortBy="+type+"&reversed"));
}
-
-
}
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2008-11-02 20:54:30 UTC (rev 23289)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2008-11-03 09:21:53 UTC (rev 23290)
@@ -59,7 +59,7 @@
}
@Override
- protected Comparator comparator(String sortBy, boolean reversed) {
+ protected Comparator<PeerNodeStatus> comparator(String sortBy, boolean
reversed) {
return new DarknetComparator(sortBy, reversed);
}
@@ -167,10 +167,9 @@
HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("sendMessageTitle"), ctx);
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
DarknetPeerNode[] peerNodes =
node.getDarknetConnections();
- HashMap peers = new HashMap();
- for(int i = 0; i < peerNodes.length; i++) {
- if
(request.isPartSet("node_"+peerNodes[i].hashCode())) {
- DarknetPeerNode pn = peerNodes[i];
+ HashMap<String, String> peers = new HashMap<String,
String>();
+ for(DarknetPeerNode pn : peerNodes) {
+ if (request.isPartSet("node_"+pn.hashCode())) {
String peer_name = pn.getName();
String peer_hash = "" + pn.hashCode();
if(!peers.containsKey(peer_hash)) {
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-11-02
20:54:30 UTC (rev 23289)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-11-03
09:21:53 UTC (rev 23290)
@@ -44,7 +44,7 @@
final NodeClientCore core;
private static FoundURICallback prefetchHook;
- static final Set prefetchAllowedTypes = new HashSet();
+ static final Set<String> prefetchAllowedTypes = new HashSet<String>();
static {
// Only valid inlines
prefetchAllowedTypes.add("image/png");
@@ -609,7 +609,7 @@
private String sanitizeReferer(ToadletContext ctx) {
// FIXME we do something similar in the GenericFilterCallback
thingy?
- String referer = (String) ctx.getHeaders().get("referer");
+ String referer = ctx.getHeaders().get("referer");
if(referer != null) {
try {
URI refererURI = new URI(referer);
Modified: trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java 2008-11-02
20:54:30 UTC (rev 23289)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequestImpl.java 2008-11-03
09:21:53 UTC (rev 23290)
@@ -3,7 +3,6 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.clients.http;
-import freenet.support.Fields;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInputStream;
@@ -16,12 +15,12 @@
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import freenet.support.Fields;
import freenet.support.Logger;
import freenet.support.MultiValueTable;
import freenet.support.SimpleReadOnlyArrayBucket;
@@ -47,9 +46,9 @@
* the parameter is used as key, the returned value is a list (of
Strings)
* with all values for that parameter sent in the request. You shouldn't
* access this map directly, use {@link #getParameterValueList(String)}
and
- * {@link #isParameterSet(String)} insted
+ * {@link #isParameterSet(String)} instead
*/
- private final Map parameterNameValuesMap = new HashMap();
+ private final Map<String, List<String>> parameterNameValuesMap = new
HashMap<String, List<String>>();
/**
* the original URI as given to the constructor
@@ -67,12 +66,12 @@
private Bucket data;
/**
- * A hasmap of buckets that we use to store all the parts for a
multipart/form-data request
+ * A hashmap of buckets that we use to store all the parts for a
multipart/form-data request
*/
- private HashMap parts;
+ private HashMap<String, Bucket> parts;
/** A map for uploaded files. */
- private Map uploadedFiles = new HashMap();
+ private Map<String, HTTPUploadedFileImpl> uploadedFiles = new
HashMap<String, HTTPUploadedFileImpl>();
private final BucketFactory bucketfactory;
@@ -124,7 +123,7 @@
this.headers = ctx.getHeaders();
this.parseRequestParameters(uri.getRawQuery(), true, false);
this.data = d;
- this.parts = new HashMap();
+ this.parts = new HashMap<String, Bucket>();
this.bucketfactory = ctx.getBucketFactory();
if(data != null) {
try {
@@ -226,7 +225,7 @@
Logger.minor(this, "Added as part:
name="+name+" value="+value);
} else {
// get the list of values for this parameter
that were parsed so far
- List valueList =
this.getParameterValueList(name);
+ List<String> valueList =
this.getParameterValueList(name);
// add this value to the list
valueList.add(value);
}
@@ -245,8 +244,8 @@
if (!this.isParameterSet(name)) {
return null;
}
- List allValues = this.getParameterValueList(name);
- return (String) allValues.get(0);
+ List<String> allValues = this.getParameterValueList(name);
+ return allValues.get(0);
}
/**
@@ -262,10 +261,10 @@
* @return the list of all values for this parameter that were parsed so
* far.
*/
- private List getParameterValueList(String name) {
- List values = (List) this.parameterNameValuesMap.get(name);
+ private List<String> getParameterValueList(String name) {
+ List<String> values = this.parameterNameValuesMap.get(name);
if (values == null) {
- values = new LinkedList();
+ values = new LinkedList<String>();
this.parameterNameValuesMap.put(name, values);
}
return values;
@@ -339,7 +338,7 @@
* @see
freenet.clients.http.HTTPRequest#getMultipleParam(java.lang.String)
*/
public String[] getMultipleParam(String name) {
- List valueList = this.getParameterValueList(name);
+ List<String> valueList = this.getParameterValueList(name);
String[] values = new String[valueList.size()];
valueList.toArray(values);
return values;
@@ -349,13 +348,13 @@
* @see
freenet.clients.http.HTTPRequest#getMultipleIntParam(java.lang.String)
*/
public int[] getMultipleIntParam(String name) {
- List valueList = this.getParameterValueList(name);
+ List<String> valueList = this.getParameterValueList(name);
// try parsing all values and put the valid Integers in a new
list
- List intValueList = new ArrayList();
+ List<Integer> intValueList = new ArrayList<Integer>();
for (int i = 0; i < valueList.size(); i++) {
try {
- intValueList.add(new Integer((String)
valueList.get(i)));
+ intValueList.add(new Integer(valueList.get(i)));
} catch (Exception e) {
// ignore invalid parameter values
}
@@ -364,7 +363,7 @@
// convert the valid Integers to an array of ints
int[] values = new int[intValueList.size()];
for (int i = 0; i < intValueList.size(); i++) {
- values[i] = ((Integer) intValueList.get(i)).intValue();
+ values[i] = intValueList.get(i);
}
return values;
}
@@ -389,7 +388,7 @@
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
if(data == null)
return;
- String ctype = (String)
this.headers.get("content-type");
+ String ctype = this.headers.get("content-type");
if(ctype == null)
return;
if(logMINOR)
@@ -541,14 +540,14 @@
* @see
freenet.clients.http.HTTPRequest#getUploadedFile(java.lang.String)
*/
public HTTPUploadedFile getUploadedFile(String name) {
- return (HTTPUploadedFile) uploadedFiles.get(name);
+ return uploadedFiles.get(name);
}
/* (non-Javadoc)
* @see freenet.clients.http.HTTPRequest#getPart(java.lang.String)
*/
public Bucket getPart(String name) {
- return (Bucket)this.parts.get(name);
+ return this.parts.get(name);
}
/* (non-Javadoc)
@@ -573,7 +572,7 @@
* @see
freenet.clients.http.HTTPRequest#getPartAsString(java.lang.String, int)
*/
public byte[] getPartAsBytes(String name, int maxlength) {
- Bucket part = (Bucket)this.parts.get(name);
+ Bucket part = this.parts.get(name);
if(part == null) return new byte[0];
if (part.size() > maxlength) return new byte[0];
@@ -601,11 +600,8 @@
*/
public void freeParts() {
if (this.parts == null) return;
- Iterator i = this.parts.keySet().iterator();
- while (i.hasNext()) {
- String key = (String) i.next();
- Bucket b = (Bucket)this.parts.get(key);
+ for (Bucket b : this.parts.values()) {
b.free();
}
parts.clear();
