changed order of sigtype and sigid
Conflicts:
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java
java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/CircuitSignalID.java
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
index 01a1fa5..9fb3fd4 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java
@@ -236,23 +236,23 @@
public final static MatchField<ClassId> BSN_VLAN_XLATE_PORT_GROUP_ID =
new MatchField<ClassId>("bsn_vlan_xlate_port_group_id", MatchFields.BSN_VLAN_XLATE_PORT_GROUP_ID);
-
- public final static MatchField<CircuitSignalID> OCH_SIGID =
- new MatchField<CircuitSignalID>("och_sigid",
- MatchFields.OCH_SIGID);
public final static MatchField<U8> OCH_SIGTYPE =
new MatchField<U8>("och_sigtype",
MatchFields.OCH_SIGTYPE);
-
- public final static MatchField<CircuitSignalID> OCH_SIGID_BASIC =
- new MatchField<CircuitSignalID>("och_sigid_basic",
- MatchFields.OCH_SIGID);
public final static MatchField<U8> OCH_SIGTYPE_BASIC =
new MatchField<U8>("och_sigtype_basic",
MatchFields.OCH_SIGTYPE_BASIC);
-
+
+
+ public final static MatchField<CircuitSignalID> OCH_SIGID =
+ new MatchField<CircuitSignalID>("och_sigid",
+ MatchFields.OCH_SIGID);
+
+ public final static MatchField<CircuitSignalID> OCH_SIGID_BASIC =
+ new MatchField<CircuitSignalID>("och_sigid_basic",
+ MatchFields.OCH_SIGID);
public String getName() {
return name;