Author: nextgens
Date: 2007-04-13 16:52:34 +0000 (Fri, 13 Apr 2007)
New Revision: 12644
Modified:
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/node/fcp/ClientGet.java
trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
trunk/freenet/src/freenet/node/fcp/FCPMessage.java
trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java
trunk/freenet/src/freenet/node/fcp/GetConfig.java
trunk/freenet/src/freenet/node/fcp/GetNode.java
trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java
trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
trunk/freenet/src/freenet/node/fcp/RemovePeer.java
trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java
trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java
trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java
trunk/freenet/src/freenet/node/fcp/WatchGlobal.java
Log:
Follow java naming conventions: constants are UPPER case!
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -22,7 +22,7 @@
public class AddPeer extends FCPMessage {
- public static final String name = "AddPeer";
+ public static final String NAME = "AddPeer";
SimpleFieldSet fs;
@@ -35,7 +35,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -151,7 +151,7 @@
if(!(client.core.allowDownloadTo(tempFile) &&
client.core.allowDownloadTo(targetFile)))
throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "Not allowed to
download to "+tempFile+" or "+targetFile, identifier, global);
else if(!(handler.allowDDAFrom(tempFile, true) &&
handler.allowDDAFrom(targetFile, true)))
- throw new
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "Not
allowed to download to "+tempFile+" or "+targetFile + ". You might need to do a
" + TestDDARequestMessage.name + " first.", identifier, global);
+ throw new
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "Not
allowed to download to "+tempFile+" or "+targetFile + ". You might need to do a
" + TestDDARequestMessage.NAME + " first.", identifier, global);
ret = new FileBucket(message.tempFile, false, true,
false, false, false);
} else if(returnType == ClientGetMessage.RETURN_TYPE_NONE) {
targetFile = null;
Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -38,7 +38,7 @@
*/
public class ClientGetMessage extends FCPMessage {
- public final static String name = "ClientGet";
+ public final static String NAME = "ClientGet";
final boolean ignoreDS;
final boolean dsOnly;
final FreenetURI uri;
@@ -209,7 +209,7 @@
}
public String getName() {
- return name;
+ 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 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ClientHelloMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -14,7 +14,7 @@
*/
public class ClientHelloMessage extends FCPMessage {
- public final static String name = "ClientHello";
+ public final static String NAME = "ClientHello";
String clientName;
String clientExpectedVersion;
@@ -36,7 +36,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutComplexDirMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -107,10 +107,10 @@
}
}
- static final String name = "ClientPutComplexDir";
+ static final String NAME = "ClientPutComplexDir";
public String getName() {
- return name;
+ return NAME;
}
long dataLength() {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -29,7 +29,7 @@
*/
public class ClientPutDiskDirMessage extends ClientPutDirMessage {
- public static String name = "ClientPutDiskDir";
+ public static String NAME = "ClientPutDiskDir";
final File dirname;
final boolean allowUnreadableFiles;
@@ -44,7 +44,7 @@
}
public String getName() {
- return name;
+ 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 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -37,7 +37,7 @@
*/
public class ClientPutMessage extends DataCarryingMessage {
- public final static String name = "ClientPut";
+ public final static String NAME = "ClientPut";
final FreenetURI uri;
final String contentType;
@@ -221,7 +221,7 @@
}
public String getName() {
- return name;
+ 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 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -35,57 +35,57 @@
* Create a message from a SimpleFieldSet, and the message's name, if
possible.
*/
public static FCPMessage create(String name, SimpleFieldSet fs,
BucketFactory bfTemp, PersistentTempBucketFactory bfPersistent) throws
MessageInvalidException {
- if(name.equals(AddPeer.name))
+ if(name.equals(AddPeer.NAME))
return new AddPeer(fs);
- if(name.equals(ClientGetMessage.name))
+ if(name.equals(ClientGetMessage.NAME))
return new ClientGetMessage(fs);
- if(name.equals(ClientHelloMessage.name))
+ if(name.equals(ClientHelloMessage.NAME))
return new ClientHelloMessage(fs);
- if(name.equals(ClientPutComplexDirMessage.name))
+ if(name.equals(ClientPutComplexDirMessage.NAME))
return new ClientPutComplexDirMessage(fs, bfTemp,
bfPersistent);
- if(name.equals(ClientPutDiskDirMessage.name))
+ if(name.equals(ClientPutDiskDirMessage.NAME))
return new ClientPutDiskDirMessage(fs);
- if(name.equals(ClientPutMessage.name))
+ if(name.equals(ClientPutMessage.NAME))
return new ClientPutMessage(fs);
- if(name.equals(GenerateSSKMessage.name))
+ if(name.equals(GenerateSSKMessage.NAME))
return new GenerateSSKMessage(fs);
- if(name.equals(GetConfig.name))
+ if(name.equals(GetConfig.NAME))
return new GetConfig(fs);
- if(name.equals(GetNode.name))
+ if(name.equals(GetNode.NAME))
return new GetNode(fs);
- if(name.equals(GetRequestStatusMessage.name))
+ if(name.equals(GetRequestStatusMessage.NAME))
return new GetRequestStatusMessage(fs);
- if(name.equals(ListPeersMessage.name))
+ if(name.equals(ListPeersMessage.NAME))
return new ListPeersMessage(fs);
- if(name.equals(ListPeerNotesMessage.name))
+ if(name.equals(ListPeerNotesMessage.NAME))
return new ListPeerNotesMessage(fs);
- if(name.equals(ListPersistentRequestsMessage.name))
+ if(name.equals(ListPersistentRequestsMessage.NAME))
return new ListPersistentRequestsMessage(fs);
- if(name.equals(ModifyConfig.name))
+ if(name.equals(ModifyConfig.NAME))
return new ModifyConfig(fs);
- if(name.equals(ModifyPeer.name))
+ if(name.equals(ModifyPeer.NAME))
return new ModifyPeer(fs);
- if(name.equals(ModifyPeerNote.name))
+ if(name.equals(ModifyPeerNote.NAME))
return new ModifyPeerNote(fs);
- if(name.equals(ModifyPersistentRequest.name))
+ if(name.equals(ModifyPersistentRequest.NAME))
return new ModifyPersistentRequest(fs);
- if(name.equals(RemovePeer.name))
+ if(name.equals(RemovePeer.NAME))
return new RemovePeer(fs);
- if(name.equals(RemovePersistentRequest.name))
+ if(name.equals(RemovePersistentRequest.NAME))
return new RemovePersistentRequest(fs);
- if(name.equals(ShutdownMessage.name))
+ if(name.equals(ShutdownMessage.NAME))
return new ShutdownMessage();
- if(name.equals(SubscribeUSKMessage.name))
+ if(name.equals(SubscribeUSKMessage.NAME))
return new SubscribeUSKMessage(fs);
- if(name.equals(TestDDARequestMessage.name))
+ if(name.equals(TestDDARequestMessage.NAME))
return new TestDDARequestMessage(fs);
- if(name.equals(TestDDAResponseMessage.name))
+ if(name.equals(TestDDAResponseMessage.NAME))
return new TestDDAResponseMessage(fs);
- if(name.equals(WatchGlobal.name))
+ if(name.equals(WatchGlobal.NAME))
return new WatchGlobal(fs);
if(name.equals("Void"))
return null;
- if(name.equals(NodeHelloMessage.name))
+ if(name.equals(NodeHelloMessage.NAME))
return new NodeHelloMessage(fs);
throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "Unknown message
name "+name, null, false);
}
Modified: trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/GenerateSSKMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -10,7 +10,7 @@
public class GenerateSSKMessage extends FCPMessage {
- static final String name = "GenerateSSK";
+ static final String NAME = "GenerateSSK";
final String identifier;
GenerateSSKMessage(SimpleFieldSet fs) {
@@ -22,7 +22,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/GetConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetConfig.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/GetConfig.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -16,7 +16,7 @@
final boolean withForceWriteFlag;
final boolean withShortDescription;
final boolean withLongDescription;
- static final String name = "GetConfig";
+ static final String NAME = "GetConfig";
public GetConfig(SimpleFieldSet fs) {
withCurrent = Fields.stringToBool(fs.get("WithCurrent"), false);
@@ -33,7 +33,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/GetNode.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetNode.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/GetNode.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -11,7 +11,7 @@
final boolean withPrivate;
final boolean withVolatile;
- static final String name = "GetNode";
+ static final String NAME = "GetNode";
public GetNode(SimpleFieldSet fs) {
withPrivate = Fields.stringToBool(fs.get("WithPrivate"), false);
@@ -23,7 +23,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/GetRequestStatusMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -12,7 +12,7 @@
final String identifier;
final boolean global;
final boolean onlyData;
- final static String name = "GetRequestStatus";
+ final static String NAME = "GetRequestStatus";
public GetRequestStatusMessage(SimpleFieldSet fs) {
this.identifier = fs.get("Identifier");
@@ -27,7 +27,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ListPeerNotesMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -9,7 +9,7 @@
public class ListPeerNotesMessage extends FCPMessage {
- static final String name = "ListPeerNotes";
+ static final String NAME = "ListPeerNotes";
final SimpleFieldSet fs;
public ListPeerNotesMessage(SimpleFieldSet fs) {
@@ -21,7 +21,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ListPeersMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -12,7 +12,7 @@
final boolean withMetadata;
final boolean withVolatile;
- static final String name = "ListPeers";
+ static final String NAME = "ListPeers";
public ListPeersMessage(SimpleFieldSet fs) {
withMetadata = Fields.stringToBool(fs.get("WithMetadata"),
false);
@@ -24,7 +24,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ListPersistentRequestsMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -8,7 +8,7 @@
public class ListPersistentRequestsMessage extends FCPMessage {
- static final String name = "ListPersistentRequests";
+ static final String NAME = "ListPersistentRequests";
public ListPersistentRequestsMessage(SimpleFieldSet fs) {
// Do nothing
@@ -19,7 +19,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyConfig.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ModifyConfig.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -12,7 +12,7 @@
public class ModifyConfig extends FCPMessage {
- static final String name = "ModifyConfig";
+ static final String NAME = "ModifyConfig";
final SimpleFieldSet fs;
@@ -25,7 +25,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeer.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeer.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -10,7 +10,7 @@
public class ModifyPeer extends FCPMessage {
- static final String name = "ModifyPeer";
+ static final String NAME = "ModifyPeer";
final SimpleFieldSet fs;
@@ -23,7 +23,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPeerNote.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -13,7 +13,7 @@
public class ModifyPeerNote extends FCPMessage {
- static final String name = "ModifyPeerNote";
+ static final String NAME = "ModifyPeerNote";
final SimpleFieldSet fs;
@@ -26,7 +26,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -23,7 +23,7 @@
*/
public class ModifyPersistentRequest extends FCPMessage {
- static final String name = "ModifyPersistentRequest";
+ static final String NAME = "ModifyPersistentRequest";
final String identifier;
final boolean global;
@@ -61,7 +61,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/NodeHelloMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -20,7 +20,7 @@
* EndMessage
*/
public class NodeHelloMessage extends FCPMessage {
- public static final String name = "NodeHello";
+ public static final String NAME = "NodeHello";
String nodeVersion;
String nodeFCPVersion;
String nodeNode;
@@ -75,7 +75,7 @@
}
public String getName() {
- return NodeHelloMessage.name;
+ return NodeHelloMessage.NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/RemovePeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePeer.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/RemovePeer.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -9,7 +9,7 @@
public class RemovePeer extends FCPMessage {
- static final String name = "RemovePeer";
+ static final String NAME = "RemovePeer";
final SimpleFieldSet fs;
@@ -22,12 +22,12 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
if(!handler.hasFullAccess()) {
- throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, name + " requires
full access", null, false);
+ throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, NAME + " requires
full access", null, false);
}
String nodeIdentifier = fs.get("NodeIdentifier");
PeerNode pn = node.getPeerNode(nodeIdentifier);
Modified: trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/RemovePersistentRequest.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -11,7 +11,7 @@
*/
public class RemovePersistentRequest extends FCPMessage {
- final static String name = "RemovePersistentRequest";
+ final static String NAME = "RemovePersistentRequest";
final String identifier;
final boolean global;
@@ -30,7 +30,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/ShutdownMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -8,7 +8,7 @@
import freenet.support.SimpleFieldSet;
public class ShutdownMessage extends FCPMessage{
- public final static String name = "Shutdown";
+ public final static String NAME = "Shutdown";
public ShutdownMessage() throws MessageInvalidException {
}
@@ -18,7 +18,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java 2007-04-13
16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/SubscribeUSKMessage.java 2007-04-13
16:52:34 UTC (rev 12644)
@@ -23,7 +23,7 @@
*/
public class SubscribeUSKMessage extends FCPMessage {
- public static final String name = "SubscribeUSK";
+ public static final String NAME = "SubscribeUSK";
final USK key;
final boolean dontPoll;
@@ -54,7 +54,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
Modified: trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/TestDDARequestMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -16,7 +16,7 @@
* @author Florent Daignière <nextgens at freenetproject.org>
*/
public class TestDDARequestMessage extends FCPMessage {
- public static final String name = "TestDDARequest";
+ public static final String NAME = "TestDDARequest";
public static final String DIRECTORY = "Directory";
public static final String WANT_READ = "WantRead";
public static final String WANT_WRITE = "WantWrite";
@@ -46,7 +46,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
Modified: trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java
2007-04-13 16:41:48 UTC (rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/TestDDAResponseMessage.java
2007-04-13 16:52:34 UTC (rev 12644)
@@ -17,7 +17,7 @@
*
*/
public class TestDDAResponseMessage extends FCPMessage {
- public static final String name = "TestDDAResponse";
+ public static final String NAME = "TestDDAResponse";
public static final String READ_CONTENT = "ReadContent";
final String identifier;
@@ -38,7 +38,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node) throws
MessageInvalidException {
@@ -51,7 +51,7 @@
if(job == null)
throw new
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "The node doesn't
know that testDDA identifier! double check it! (" + identifier + ").",
identifier, false);
else if((job.readFilename != null) && (readContent == null))
- throw new
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "You need to send "
+ READ_CONTENT + " back to the node if you specify " +
TestDDARequestMessage.WANT_READ + " in " + TestDDARequestMessage.name + '.',
identifier, false);
+ throw new
MessageInvalidException(ProtocolErrorMessage.MISSING_FIELD, "You need to send "
+ READ_CONTENT + " back to the node if you specify " +
TestDDARequestMessage.WANT_READ + " in " + TestDDARequestMessage.NAME + '.',
identifier, false);
TestDDACompleteMessage reply = new
TestDDACompleteMessage(handler, job, readContent);
handler.outputHandler.queue(reply);
Modified: trunk/freenet/src/freenet/node/fcp/WatchGlobal.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/WatchGlobal.java 2007-04-13 16:41:48 UTC
(rev 12643)
+++ trunk/freenet/src/freenet/node/fcp/WatchGlobal.java 2007-04-13 16:52:34 UTC
(rev 12644)
@@ -11,7 +11,7 @@
final boolean enabled;
final int verbosityMask;
- static final String name = "WatchGlobal";
+ static final String NAME = "WatchGlobal";
public WatchGlobal(SimpleFieldSet fs) throws MessageInvalidException {
enabled = Fields.stringToBool(fs.get("Enabled"), true);
@@ -34,7 +34,7 @@
}
public String getName() {
- return name;
+ return NAME;
}
public void run(FCPConnectionHandler handler, Node node)
