| commit | db0e098306ec680b65b84c778b160f696514d064 | [log] [tgz] |
|---|---|---|
| author | Byungjoon Lee <bjlee@etri.re.kr> | Mon May 12 16:59:50 2014 +0900 |
| committer | Byungjoon Lee <bjlee@etri.re.kr> | Mon May 12 16:59:50 2014 +0900 |
| tree | aa19a5eeb8e602a0a83e9d0ef3c926982e22919e | |
| parent | 2d686787e74f7e10a383bf1ff2222e511033ded1 [diff] | |
| parent | 2b6e5781bca0538e8c568e8d3bc3569bb2c06eb7 [diff] |
Merge branch 'of_tunnel_id' into icmpv4_tostring
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Code.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Code.java index 6466eee..ced5737 100644 --- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Code.java +++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Code.java
@@ -90,4 +90,9 @@ public void putTo(PrimitiveSink sink) { sink.putShort(code); } + + @Override + public String toString() { + return String.valueOf(this.code); + } }
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Type.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Type.java index a0aa152..634bc03 100644 --- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Type.java +++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/ICMPv4Type.java
@@ -200,4 +200,8 @@ sink.putShort(type); } + @Override + public String toString() { + return String.valueOf(this.type); + } }
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/IPAddress.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/IPAddress.java index 6a1868e..1c5be86 100644 --- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/IPAddress.java +++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/IPAddress.java
@@ -31,14 +31,14 @@ /** * Perform a low level AND operation on the bits of two IPAddress<?> objects - * @param other F + * @param other IPAddress<?> * @return new IPAddress<?> object after the AND oper */ public abstract F and(F other); /** * Perform a low level OR operation on the bits of two IPAddress<?> objects - * @param other F + * @param other IPAddress<?> * @return new IPAddress<?> object after the AND oper */ public abstract F or(F other);