commit 161a5d5f4e0cc88170f4496e6cd93b8f06b4e8a1
author Yotam Harchol <yotam.harchol@bigswitch.com> Thu Jul 25 17:17:48 2013 -0700
committer Andreas Wundsam <andreas.wundsam@bigswitch.com> Sat Jul 27 18:59:56 2013 -0700
tree aa7b2cc15681b4a9f90032df14dfadabdd0d12ce
parent d055b0c53a316225d84a7ed2e73b82c5ad119f06

Updated Java types according to new design

java_gen/pre-written/src/main/java/org/openflow/protocol/match/MatchField.java

diff --git a/java_gen/pre-written/src/main/java/org/openflow/protocol/match/MatchField.java b/java_gen/pre-written/src/main/java/org/openflow/protocol/match/MatchField.java
index b6e8317..cc191ab 100644
--- a/java_gen/pre-written/src/main/java/org/openflow/protocol/match/MatchField.java
+++ b/java_gen/pre-written/src/main/java/org/openflow/protocol/match/MatchField.java
@@ -2,18 +2,15 @@
 
 import org.openflow.types.EthType;
 import org.openflow.types.IPv4;
-import org.openflow.types.IPv4WithMask;
 import org.openflow.types.IPv6;
-import org.openflow.types.IPv6WithMask;
 import org.openflow.types.IpProtocol;
 import org.openflow.types.MacAddress;
-import org.openflow.types.MacAddressWithMask;
+import org.openflow.types.Masked;
 import org.openflow.types.OFPort;
 import org.openflow.types.U16;
 import org.openflow.types.U8;
 import org.openflow.types.VlanPcp;
 import org.openflow.types.VlanVid;
-import org.openflow.types.VlanVidWithMask.VlanVidWithMask;
 
 public class MatchField<F, M> {
     private final String name;
@@ -36,18 +33,20 @@
     public final static MatchField<OFPort, NoMatch> METADATA =
             new MatchField<OFPort, NoMatch>("metadata");
 
-    public final static MatchField<MacAddress, MacAddressWithMask> ETH_DST =
-            new MatchField<MacAddress, MacAddressWithMask>("eth_dst");
-    public final static MatchField<MacAddress, MacAddressWithMask> ETH_SRC =
-            new MatchField<MacAddress, MacAddressWithMask>("eth_src", 1);
+    public final static MatchField<MacAddress, Masked<MacAddress>> ETH_DST =
+            new MatchField<MacAddress, Masked<MacAddress>>("eth_dst");
+    public final static MatchField<MacAddress, Masked<MacAddress>> ETH_SRC =
+            new MatchField<MacAddress, Masked<MacAddress>>("eth_src", 1);
 
     public final static MatchField<EthType, NoMatch> ETH_TYPE =
             new MatchField<EthType, NoMatch>("eth_type");
-    public final static MatchField<VlanVid, VlanVidWithMask> VLAN_VID =
-            new MatchField<VlanVid, VlanVidWithMask>("vlan_vid");
+    
+    public final static MatchField<VlanVid, Masked<VlanVid>> VLAN_VID =
+            new MatchField<VlanVid, Masked<VlanVid>>("vlan_vid");
     public final static MatchField<VlanPcp, NoMatch> VLAN_PCP =
             new MatchField<VlanPcp, NoMatch>("vlan_pcp");
-
+    
+    
     public final static MatchField<NoMatch, NoMatch> IP_DSCP =
             new MatchField<NoMatch, NoMatch>("ip_dscp");
     public final static MatchField<NoMatch, NoMatch> IP_ECN =
@@ -55,10 +54,10 @@
     public final static MatchField<IpProtocol, NoMatch> IP_PROTO =
             new MatchField<IpProtocol, NoMatch>("ip_proto");
 
-    public final static MatchField<IPv4, IPv4WithMask> IPV4_SRC =
-            new MatchField<IPv4, IPv4WithMask>("ipv4_src");
-    public final static MatchField<IPv4, IPv4WithMask> IPV4_DST =
-            new MatchField<IPv4, IPv4WithMask>("ipv4_dst");
+    public final static MatchField<IPv4, Masked<IPv4>> IPV4_SRC =
+            new MatchField<IPv4, Masked<IPv4>>("ipv4_src");
+    public final static MatchField<IPv4, Masked<IPv4>> IPV4_DST =
+            new MatchField<IPv4, Masked<IPv4>>("ipv4_dst");
 
     public final static MatchField<U16, NoMatch> TCP_SRC = new MatchField<U16, NoMatch>(
             "tcp_src");
@@ -82,22 +81,23 @@
 
     public final static MatchField<U16, NoMatch> ARP_OP = new MatchField<U16, NoMatch>(
             "arp_op");
-    public final static MatchField<IPv4, IPv4WithMask> ARP_SPA =
-            new MatchField<IPv4, IPv4WithMask>("arp_spa");
-    public final static MatchField<IPv4, IPv4WithMask> ARP_TPA =
-            new MatchField<IPv4, IPv4WithMask>("arp_tpa");
-    public final static MatchField<MacAddress, MacAddressWithMask> ARP_SHA =
-            new MatchField<MacAddress, MacAddressWithMask>("arp_sha");
-    public final static MatchField<MacAddress, MacAddressWithMask> ARP_THA =
-            new MatchField<MacAddress, MacAddressWithMask>("arp_tha");
+    public final static MatchField<IPv4, Masked<IPv4>> ARP_SPA =
+            new MatchField<IPv4, Masked<IPv4>>("arp_spa");
+    public final static MatchField<IPv4, Masked<IPv4>> ARP_TPA =
+            new MatchField<IPv4, Masked<IPv4>>("arp_tpa");
+    public final static MatchField<MacAddress, Masked<MacAddress>> ARP_SHA =
+            new MatchField<MacAddress, Masked<MacAddress>>("arp_sha");
+    public final static MatchField<MacAddress, Masked<MacAddress>> ARP_THA =
+            new MatchField<MacAddress, Masked<MacAddress>>("arp_tha");
 
-    public final static MatchField<IPv6, IPv6WithMask> IPV6_SRC =
-            new MatchField<IPv6, IPv6WithMask>("ipv6_src");
-    public final static MatchField<IPv6, IPv6WithMask> IPV6_DST =
-            new MatchField<IPv6, IPv6WithMask>("ipv6_dst");
+    public final static MatchField<IPv6, Masked<IPv6>> IPV6_SRC =
+            new MatchField<IPv6, Masked<IPv6>>("ipv6_src");
+    public final static MatchField<IPv6, Masked<IPv6>> IPV6_DST =
+            new MatchField<IPv6, Masked<IPv6>>("ipv6_dst");
 
-    public final static MatchField<U8, IPv6WithMask> IPV6_FLABEL =
-            new MatchField<U8, IPv6WithMask>("ipv6_flabel");
+    // FIXME: Wrong masked type?
+    public final static MatchField<U8, Masked<IPv6>> IPV6_FLABEL =
+            new MatchField<U8, Masked<IPv6>>("ipv6_flabel");
 
     public String getName() {
         return name;