Author: j16sdiz
Date: 2008-11-06 05:16:52 +0000 (Thu, 06 Nov 2008)
New Revision: 23331
Modified:
trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/PageMaker.java
Log:
generic, for-loop
Modified: trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2008-11-06 01:37:00 UTC (rev 23330)
+++ trunk/freenet/src/freenet/clients/http/LocalFileInsertToadlet.java
2008-11-06 05:16:52 UTC (rev 23331)
@@ -84,11 +84,8 @@
if (currentPath.exists() && currentPath.isDirectory() &&
currentPath.canRead()) {
File[] files = currentPath.listFiles();
- Arrays.sort(files, new Comparator() {
-
- public int compare(Object first, Object second)
{
- File firstFile = (File) first;
- File secondFile = (File) second;
+ Arrays.sort(files, new Comparator<File>() {
+ public int compare(File firstFile, File
secondFile) {
if (firstFile.isDirectory() &&
!secondFile.isDirectory()) {
return -1;
}
Modified: trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2008-11-06
01:37:00 UTC (rev 23330)
+++ trunk/freenet/src/freenet/clients/http/N2NTMToadlet.java 2008-11-06
05:16:52 UTC (rev 23331)
@@ -7,7 +7,6 @@
import java.io.IOException;
import java.net.URI;
import java.util.HashMap;
-import java.util.Iterator;
import freenet.client.HighLevelSimpleClient;
import freenet.l10n.L10n;
@@ -80,7 +79,7 @@
.generate());
return;
}
- HashMap peers = new HashMap();
+ HashMap<String, String> peers = new HashMap<String,
String>();
peers.put(input_hashcode_string, peernode_name);
createN2NTMSendForm(pageNode, contentNode, ctx, peers);
this.writeHTMLReply(ctx, 200, "OK",
pageNode.generate());
@@ -235,7 +234,7 @@
}
public static void createN2NTMSendForm(HTMLNode pageNode,
- HTMLNode contentNode, ToadletContext ctx, HashMap peers)
+ HTMLNode contentNode, ToadletContext ctx,
HashMap<String, String> peers)
throws ToadletContextClosedException, IOException {
HTMLNode infobox = contentNode.addChild("div", new String[] {
"class",
"id" }, new String[] { "infobox", "n2nbox" });
@@ -245,8 +244,7 @@
messageTargets.addChild("p", l10n("composingMessageLabel"));
HTMLNode messageTargetList = messageTargets.addChild("ul");
// Iterate peers
- for (Iterator it = peers.values().iterator(); it.hasNext();) {
- String peer_name = (String) it.next();
+ for (String peer_name: peers.values()) {
messageTargetList.addChild("li", peer_name);
}
HTMLNode infoboxContent = infobox.addChild("div", "class",
@@ -254,8 +252,7 @@
HTMLNode messageForm = ctx.addFormChild(infoboxContent,
"/send_n2ntm/",
"sendN2NTMForm");
// Iterate peers
- for (Iterator it = peers.keySet().iterator(); it.hasNext();) {
- String peerNodeHash = (String) it.next();
+ for (String peerNodeHash : peers.keySet()) {
messageForm.addChild("input", new String[] { "type",
"name",
"value" }, new String[] { "hidden",
"node_" + peerNodeHash,
"1" });
Modified: trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
2008-11-06 01:37:00 UTC (rev 23330)
+++ trunk/freenet/src/freenet/clients/http/OpennetConnectionsToadlet.java
2008-11-06 05:16:52 UTC (rev 23331)
@@ -115,7 +115,7 @@
}
@Override
- protected Comparator comparator(String sortBy, boolean reversed) {
+ protected Comparator<PeerNodeStatus> comparator(String sortBy, boolean
reversed) {
return new OpennetComparator(sortBy, reversed);
}
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-11-06
01:37:00 UTC (rev 23330)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-11-06
05:16:52 UTC (rev 23331)
@@ -5,7 +5,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -66,13 +65,13 @@
public static final int MODE_ADVANCED = 2;
private THEME theme;
private File override;
- private final List navigationLinkTexts = new ArrayList();
- private final List navigationLinkTextsNonFull = new ArrayList();
- private final Map navigationLinkTitles = new HashMap();
- private final Map navigationLinks = new HashMap();
- private final Map contentNodes = new HashMap();
- private final Map/*<HTMLNode, HTMLNode>*/ headNodes = new HashMap();
- private final Map /* <String, LinkEnabledCallback> */
navigationLinkCallbacks = new HashMap();
+ private final List<String> navigationLinkTexts = new
ArrayList<String>();
+ private final List<String> navigationLinkTextsNonFull = new
ArrayList<String>();
+ private final Map<String, String> navigationLinkTitles = new
HashMap<String, String>();
+ private final Map<String, String> navigationLinks = new HashMap<String,
String>();
+ private final Map<HTMLNode, HTMLNode> contentNodes = new
HashMap<HTMLNode, HTMLNode>();
+ private final Map<HTMLNode, HTMLNode> headNodes = new HashMap<HTMLNode,
HTMLNode>();
+ private final Map<String, LinkEnabledCallback> navigationLinkCallbacks
= new HashMap<String, LinkEnabledCallback>();
private final FredPluginL10n plugin;
private final boolean pluginMode;
@@ -128,7 +127,7 @@
}
public HTMLNode createBackLink(ToadletContext toadletContext, String
name) {
- String referer = (String)
toadletContext.getHeaders().get("referer");
+ String referer = toadletContext.getHeaders().get("referer");
if (referer != null) {
return new HTMLNode("a", new String[] { "href", "title"
}, new String[] { referer, name }, name);
}
@@ -162,12 +161,11 @@
if (renderNavigationLinks) {
HTMLNode navbarDiv = pageDiv.addChild("div", "id",
"navbar");
HTMLNode navbarUl = navbarDiv.addChild("ul", "id",
"navlist");
- for (Iterator navigationLinkIterator = fullAccess ?
navigationLinkTexts.iterator() : navigationLinkTextsNonFull.iterator();
navigationLinkIterator.hasNext();) {
- String navigationLink = (String)
navigationLinkIterator.next();
- LinkEnabledCallback cb = (LinkEnabledCallback)
navigationLinkCallbacks.get(navigationLink);
+ for (String navigationLink : fullAccess ?
navigationLinkTexts : navigationLinkTextsNonFull) {
+ LinkEnabledCallback cb =
navigationLinkCallbacks.get(navigationLink);
if(cb != null && !cb.isEnabled()) continue;
- String navigationTitle = (String)
navigationLinkTitles.get(navigationLink);
- String navigationPath = (String)
navigationLinks.get(navigationLink);
+ String navigationTitle =
navigationLinkTitles.get(navigationLink);
+ String navigationPath =
navigationLinks.get(navigationLink);
HTMLNode listItem = navbarUl.addChild("li");
if (plugin != null)
listItem.addChild("a", new String[] {
"href", "title" }, new String[] { navigationPath,
plugin.getString(navigationTitle) }, plugin.getString(navigationLink));
@@ -192,7 +190,7 @@
* already been called
*/
public HTMLNode getHeadNode(HTMLNode pageNode) {
- return (HTMLNode) headNodes.remove(pageNode);
+ return headNodes.remove(pageNode);
}
/**
@@ -209,7 +207,7 @@
*/
public HTMLNode getContentNode(HTMLNode node) {
headNodes.remove(node);
- return (HTMLNode) contentNodes.remove(node);
+ return contentNodes.remove(node);
}
public HTMLNode getInfobox(String header) {
