Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
SAL Actions Property is OF1.0 specific
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
core
/
Node.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
index d21a147506dfd8e2f546ddd5210df33b1fc29c20..ecb1f604d5e30c450f8613daf3328ea54f9e220a 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
@@
-26,7
+26,6
@@
import java.util.concurrent.ConcurrentHashMap;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@@
-245,6
+244,7
@@
public class Node implements Serializable {
*
* @param type of node to be set
*/
*
* @param type of node to be set
*/
+ @SuppressWarnings("unused")
private void setType(String type) {
this.nodeType = type;
if (this.nodeIDString != null) {
private void setType(String type) {
this.nodeType = type;
if (this.nodeIDString != null) {
@@
-281,6
+281,7
@@
public class Node implements Serializable {
*
* @param nodeIDString String representation for NodeID
*/
*
* @param nodeIDString String representation for NodeID
*/
+ @SuppressWarnings("unused")
private void setNodeIDString(String nodeIDString) {
this.nodeIDString = nodeIDString;
if (this.nodeType != null) {
private void setNodeIDString(String nodeIDString) {
this.nodeIDString = nodeIDString;
if (this.nodeType != null) {
@@
-323,10
+324,10
@@
public class Node implements Serializable {
@Override
public String toString() {
if (this.nodeType.equals(NodeIDType.OPENFLOW)) {
@Override
public String toString() {
if (this.nodeType.equals(NodeIDType.OPENFLOW)) {
- return this.nodeType
.toString()
+ "|"
+ return this.nodeType + "|"
+ HexEncode.longToHexString((Long) this.nodeID);
} else {
+ HexEncode.longToHexString((Long) this.nodeID);
} else {
- return this.nodeType
.toString()
+ "|" + this.nodeID.toString();
+ return this.nodeType + "|" + this.nodeID.toString();
}
}
}
}