projects
/
jFCPlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update license to GPLv3, fix header comments
[jFCPlib.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
fcp
/
AddPeer.java
diff --git
a/src/main/java/net/pterodactylus/fcp/AddPeer.java
b/src/main/java/net/pterodactylus/fcp/AddPeer.java
index
e9ad80d
..
45a5937
100644
(file)
--- a/
src/main/java/net/pterodactylus/fcp/AddPeer.java
+++ b/
src/main/java/net/pterodactylus/fcp/AddPeer.java
@@
-1,9
+1,9
@@
/*
/*
- * jFCPlib - AddPeer.java - Copyright © 2008 David Roden
+ * jFCPlib - AddPeer.java - Copyright © 2008
–2016
David Roden
*
*
- * This program is free software
;
you can redistribute it and/or modify
+ * This program is free software
:
you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation
; either version 2
of the License, or
+ * the Free Software Foundation
, either version 3
of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@
-12,8
+12,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.pterodactylus.fcp;
*/
package net.pterodactylus.fcp;
@@
-46,6
+45,11
@@
public class AddPeer extends FcpMessage {
setField("File", file);
}
setField("File", file);
}
+ public AddPeer(String identifier, String file) {
+ this(file);
+ setField("Identifier", identifier);
+ }
+
/**
* Creates a new “AddPeer” request that reads the noderef of the peer from
* the given URL.
/**
* Creates a new “AddPeer” request that reads the noderef of the peer from
* the given URL.
@@
-58,6
+62,11
@@
public class AddPeer extends FcpMessage {
setField("URL", String.valueOf(url));
}
setField("URL", String.valueOf(url));
}
+ public AddPeer(String identifier, URL url) {
+ this(url);
+ setField("Identifier", identifier);
+ }
+
/**
* Creates a new “AddPeer” request that adds the peer given by the noderef.
*
/**
* Creates a new “AddPeer” request that adds the peer given by the noderef.
*
@@
-69,6
+78,11
@@
public class AddPeer extends FcpMessage {
setNodeRef(nodeRef);
}
setNodeRef(nodeRef);
}
+ public AddPeer(String identifier, NodeRef nodeRef) {
+ this(nodeRef);
+ setField("Identifier", identifier);
+ }
+
//
// PRIVATE METHODS
//
//
// PRIVATE METHODS
//
@@
-80,7
+94,7
@@
public class AddPeer extends FcpMessage {
* The noderef of the peer
*/
private void setNodeRef(NodeRef nodeRef) {
* The noderef of the peer
*/
private void setNodeRef(NodeRef nodeRef) {
- setField("lastGoodVersion",
nodeRef.getLastGoodVersion().toString(
));
+ setField("lastGoodVersion",
String.valueOf(nodeRef.getLastGoodVersion()
));
setField("opennet", String.valueOf(nodeRef.isOpennet()));
setField("identity", nodeRef.getIdentity());
setField("myName", nodeRef.getMyName());
setField("opennet", String.valueOf(nodeRef.isOpennet()));
setField("identity", nodeRef.getIdentity());
setField("myName", nodeRef.getMyName());