Author: zothar
Date: 2007-09-23 16:26:56 +0000 (Sun, 23 Sep 2007)
New Revision: 15286
Added:
trunk/freenet/src/freenet/node/fcp/PeerMessage.java
Removed:
trunk/freenet/src/freenet/node/fcp/Peer.java
Modified:
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
Log:
Rename the freenet.node.fcp.Peer class to PeerMessage to avoid confusion with
io.comm.Peer
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-09-23 16:02:34 UTC
(rev 15285)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-09-23 16:26:56 UTC
(rev 15286)
@@ -149,7 +149,7 @@
}
System.out.println("Added darknet peer: "+pn);
}
- handler.outputHandler.queue(new Peer(pn, true, true));
+ handler.outputHandler.queue(new PeerMessage(pn, true, true));
}
}
Modified: trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java 2007-09-23
16:02:34 UTC (rev 15285)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerMessage.java 2007-09-23
16:26:56 UTC (rev 15286)
@@ -36,7 +36,7 @@
handler.outputHandler.queue(msg);
return;
}
- handler.outputHandler.queue(new Peer(pn, true, true));
+ handler.outputHandler.queue(new PeerMessage(pn, true, true));
}
}
Modified: trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java 2007-09-23
16:02:34 UTC (rev 15285)
+++ trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java 2007-09-23
16:26:56 UTC (rev 15286)
@@ -35,7 +35,7 @@
PeerNode[] nodes = node.getPeerNodes();
for(int i = 0; i < nodes.length; i++) {
PeerNode pn = nodes[i];
- handler.outputHandler.queue(new Peer(pn, withMetadata,
withVolatile));
+ handler.outputHandler.queue(new PeerMessage(pn,
withMetadata, withVolatile));
}
handler.outputHandler.queue(new EndListPeersMessage());
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeer.java 2007-09-23 16:02:34 UTC
(rev 15285)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeer.java 2007-09-23 16:26:56 UTC
(rev 15286)
@@ -76,7 +76,7 @@
dpn.setAllowLocalAddresses(Fields.stringToBool(allowLocalAddressesString,
false));
}
}
- handler.outputHandler.queue(new Peer(pn, true, true));
+ handler.outputHandler.queue(new PeerMessage(pn, true, true));
}
}
Deleted: trunk/freenet/src/freenet/node/fcp/Peer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/Peer.java 2007-09-23 16:02:34 UTC
(rev 15285)
+++ trunk/freenet/src/freenet/node/fcp/Peer.java 2007-09-23 16:26:56 UTC
(rev 15286)
@@ -1,49 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.fcp;
-
-import freenet.node.Node;
-import freenet.node.PeerNode;
-import freenet.support.SimpleFieldSet;
-
-public class Peer extends FCPMessage {
- static final String name = "Peer";
-
- final PeerNode pn;
- final boolean withMetadata;
- final boolean withVolatile;
-
- public Peer(PeerNode pn, boolean withMetadata, boolean withVolatile) {
- this.pn = pn;
- this.withMetadata = withMetadata;
- this.withVolatile = withVolatile;
- }
-
- public SimpleFieldSet getFieldSet() {
- SimpleFieldSet fs = pn.exportFieldSet();
- if(withMetadata) {
- SimpleFieldSet meta = pn.exportMetadataFieldSet();
- if(!meta.isEmpty()) {
- fs.put("metadata", meta);
- }
- }
- if(withVolatile) {
- SimpleFieldSet vol = pn.exportVolatileFieldSet();
- if(!vol.isEmpty()) {
- fs.put("volatile", vol);
- }
- }
- return fs;
- }
-
- public String getName() {
- return name;
- }
-
- public void run(FCPConnectionHandler handler, Node node)
- throws MessageInvalidException {
- throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "Peer goes from
server to client not the other way around", null, false);
- }
-
-}
Copied: trunk/freenet/src/freenet/node/fcp/PeerMessage.java (from rev 15284,
trunk/freenet/src/freenet/node/fcp/Peer.java)
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PeerMessage.java
(rev 0)
+++ trunk/freenet/src/freenet/node/fcp/PeerMessage.java 2007-09-23 16:26:56 UTC
(rev 15286)
@@ -0,0 +1,49 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+package freenet.node.fcp;
+
+import freenet.node.Node;
+import freenet.node.PeerNode;
+import freenet.support.SimpleFieldSet;
+
+public class PeerMessage extends FCPMessage {
+ static final String name = "Peer";
+
+ final PeerNode pn;
+ final boolean withMetadata;
+ final boolean withVolatile;
+
+ public PeerMessage(PeerNode pn, boolean withMetadata, boolean
withVolatile) {
+ this.pn = pn;
+ this.withMetadata = withMetadata;
+ this.withVolatile = withVolatile;
+ }
+
+ public SimpleFieldSet getFieldSet() {
+ SimpleFieldSet fs = pn.exportFieldSet();
+ if(withMetadata) {
+ SimpleFieldSet meta = pn.exportMetadataFieldSet();
+ if(!meta.isEmpty()) {
+ fs.put("metadata", meta);
+ }
+ }
+ if(withVolatile) {
+ SimpleFieldSet vol = pn.exportVolatileFieldSet();
+ if(!vol.isEmpty()) {
+ fs.put("volatile", vol);
+ }
+ }
+ return fs;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void run(FCPConnectionHandler handler, Node node)
+ throws MessageInvalidException {
+ throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "Peer goes from
server to client not the other way around", null, false);
+ }
+
+}
