Author: toad
Date: 2006-01-18 17:48:55 +0000 (Wed, 18 Jan 2006)
New Revision: 7875
Modified:
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
trunk/freenet/src/freenet/node/fcp/FCPMessage.java
trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
Log:
363: Change the names of some FCP messages.
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-18 17:34:28 UTC (rev
7874)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-18 17:48:55 UTC (rev
7875)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 362;
+ public static final int buildNumber = 363;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 359;
Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2006-01-18
17:34:28 UTC (rev 7874)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2006-01-18
17:48:55 UTC (rev 7875)
@@ -25,6 +25,7 @@
*/
public class ClientGetMessage extends FCPMessage {
+ public final static String name = "ClientGet";
final boolean ignoreDS;
final boolean dsOnly;
final FreenetURI uri;
@@ -120,7 +121,7 @@
}
public String getName() {
- return "ClientGet";
+ return name;
}
public void run(FCPConnectionHandler handler, Node node) {
Modified: trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java 2006-01-18
17:34:28 UTC (rev 7874)
+++ trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java 2006-01-18
17:48:55 UTC (rev 7875)
@@ -11,6 +11,7 @@
*/
public class ClientHelloMessage extends FCPMessage {
+ public final static String name = "ClientHello";
String clientName;
String clientExpectedVersion;
@@ -32,7 +33,7 @@
}
public String getName() {
- return "ClientHello";
+ return name;
}
public void run(FCPConnectionHandler handler, Node node) {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-01-18
17:34:28 UTC (rev 7874)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-01-18
17:48:55 UTC (rev 7875)
@@ -21,6 +21,8 @@
*/
public class ClientPutMessage extends DataCarryingMessage {
+ public final static String name = "ClientPut";
+
final FreenetURI uri;
final String contentType;
final long dataLength;
@@ -81,7 +83,7 @@
}
public String getName() {
- return "ClientPut";
+ return name;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/FCPMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-01-18 17:34:28 UTC
(rev 7874)
+++ trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-01-18 17:48:55 UTC
(rev 7875)
@@ -25,11 +25,11 @@
public abstract String getName();
public static FCPMessage create(String name, SimpleFieldSet fs) throws
MessageInvalidException {
- if(name.equals("ClientHello"))
+ if(name.equals(ClientHelloMessage.name))
return new ClientHelloMessage(fs);
- if(name.equals("ClientGet"))
+ if(name.equals(ClientGetMessage.name))
return new ClientGetMessage(fs);
- if(name.equals("ClientPut"))
+ if(name.equals(ClientPutMessage.name))
return new ClientPutMessage(fs);
if(name.equals("Void"))
return null;
Modified: trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java 2006-01-18
17:34:28 UTC (rev 7874)
+++ trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java 2006-01-18
17:48:55 UTC (rev 7875)
@@ -38,7 +38,7 @@
}
public String getName() {
- return "FetchError";
+ return "GetFailed";
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
2006-01-18 17:34:28 UTC (rev 7874)
+++ trunk/freenet/src/freenet/node/fcp/PutSuccessfulMessage.java
2006-01-18 17:48:55 UTC (rev 7875)
@@ -22,7 +22,7 @@
}
public String getName() {
- return "InsertSuccessful";
+ return "PutSuccessful";
}
public void run(FCPConnectionHandler handler, Node node)
