Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "creating a default subnet"
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
core
/
Bandwidth.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java
index 1282d5ef9c2c18259077390a32a4d6840c8ac068..30f27793dea433b8c07defe6335c709024eb8184 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java
@@
-9,6
+9,8
@@
package org.opendaylight.controller.sal.core;
package org.opendaylight.controller.sal.core;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
@@
-22,6
+24,7
@@
import javax.xml.bind.annotation.XmlRootElement;
* seconds.
*/
@XmlRootElement
* seconds.
*/
@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
public class Bandwidth extends Property {
private static final long serialVersionUID = 1L;
public class Bandwidth extends Property {
private static final long serialVersionUID = 1L;
@@
-49,7
+52,6
@@
public class Bandwidth extends Property {
private Bandwidth() {
super(BandwidthPropName);
this.bandwidthValue = BWUNK;
private Bandwidth() {
super(BandwidthPropName);
this.bandwidthValue = BWUNK;
- ;
}
public Bandwidth(long bandwidth) {
}
public Bandwidth(long bandwidth) {
@@
-105,24
+107,25
@@
public class Bandwidth extends Property {
@Override
public String toString() {
@Override
public String toString() {
- StringBuffer sb = new StringBuffer();
+ return "BandWidth[" + getStringValue() + "]";
+ }
- sb.append("BandWidth[");
+ @Override
+ public String getStringValue() {
if (this.bandwidthValue == 0) {
if (this.bandwidthValue == 0) {
-
sb.append
("UnKnown");
+
return
("UnKnown");
} else if (this.bandwidthValue < BW1Kbps) {
} else if (this.bandwidthValue < BW1Kbps) {
-
sb.append
(this.bandwidthValue + "bps");
+
return
(this.bandwidthValue + "bps");
} else if (this.bandwidthValue < BW1Mbps) {
} else if (this.bandwidthValue < BW1Mbps) {
-
sb.append
(Long.toString(this.bandwidthValue / BW1Kbps) + "Kbps");
+
return
(Long.toString(this.bandwidthValue / BW1Kbps) + "Kbps");
} else if (this.bandwidthValue < BW1Gbps) {
} else if (this.bandwidthValue < BW1Gbps) {
-
sb.append
(Long.toString(this.bandwidthValue / BW1Mbps) + "Mbps");
+
return
(Long.toString(this.bandwidthValue / BW1Mbps) + "Mbps");
} else if (this.bandwidthValue < BW1Tbps) {
} else if (this.bandwidthValue < BW1Tbps) {
-
sb.append
(Long.toString(this.bandwidthValue / BW1Gbps) + "Gbps");
+
return
(Long.toString(this.bandwidthValue / BW1Gbps) + "Gbps");
} else if (this.bandwidthValue < BW1Pbps) {
} else if (this.bandwidthValue < BW1Pbps) {
- sb.append(Long.toString(this.bandwidthValue / BW1Tbps) + "Tbps");
+ return(Long.toString(this.bandwidthValue / BW1Tbps) + "Tbps");
+ } else {
+ return(this.bandwidthValue + "bps");
}
}
-
- sb.append("]");
- return sb.toString();
}
}
}
}