From: Marian Adamjak <marian.adamjak@pantheon.sk>
Date: Thu, 23 Oct 2014 07:25:43 +0000 (+0200)
Subject: Change local names of local variables in FeaturesReplyMessageFactory and OxmIpv6ExtHd... 
X-Git-Tag: release/lithium~107
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=cc0ff9a6faefd0e3a863ba17a2440454433af9f5;p=openflowjava.git

Change local names of local variables in FeaturesReplyMessageFactory and OxmIpv6ExtHdrDeserializer

Change-Id: Id55fae5958725e9526f9a5633f8ea7fde8ac9c5b
Signed-off-by: Marian Adamjak <marian.adamjak@pantheon.sk>
---

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java
index d7991eb9..b599c208 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FeaturesReplyMessageFactory.java
@@ -45,15 +45,15 @@ public class FeaturesReplyMessageFactory implements OFDeserializer<GetFeaturesOu
     }
 
     private static Capabilities createCapabilities(long input) {
-        final Boolean FLOW_STATS = (input & (1 << 0)) != 0;
-        final Boolean TABLE_STATS = (input & (1 << 1)) != 0;
-        final Boolean PORT_STATS = (input & (1 << 2)) != 0;
-        final Boolean GROUP_STATS = (input & (1 << 3)) != 0;
-        final Boolean IP_REASM = (input & (1 << 5)) != 0;
-        final Boolean QUEUE_STATS = (input & (1 << 6)) != 0;
-        final Boolean PORT_BLOCKED = (input & (1 << 8)) != 0;
-        return new Capabilities(FLOW_STATS, GROUP_STATS, IP_REASM,
-                PORT_BLOCKED, PORT_STATS, QUEUE_STATS, TABLE_STATS);
+        final Boolean flowStats = (input & (1 << 0)) != 0;
+        final Boolean tableStats = (input & (1 << 1)) != 0;
+        final Boolean portStats = (input & (1 << 2)) != 0;
+        final Boolean groupStats = (input & (1 << 3)) != 0;
+        final Boolean ipReasm = (input & (1 << 5)) != 0;
+        final Boolean queueStats = (input & (1 << 6)) != 0;
+        final Boolean portBlocked = (input & (1 << 8)) != 0;
+        return new Capabilities(flowStats, groupStats, ipReasm,
+                portBlocked, portStats, queueStats, tableStats);
     }
 
 }
diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java
index e4925d47..26f7f839 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializer.java
@@ -42,16 +42,16 @@ public class OxmIpv6ExtHdrDeserializer extends AbstractOxmMatchEntryDeserializer
             MatchEntriesBuilder builder) {
         PseudoFieldMatchEntryBuilder pseudoBuilder = new PseudoFieldMatchEntryBuilder();
         int bitmap = input.readUnsignedShort();
-        final Boolean NONEXT = ((bitmap) & (1<<0)) != 0;
-        final Boolean ESP = ((bitmap) & (1<<1)) != 0;
-        final Boolean AUTH = ((bitmap) & (1<<2)) != 0;
-        final Boolean DEST = ((bitmap) & (1<<3)) != 0;
-        final Boolean FRAG = ((bitmap) & (1<<4)) != 0;
-        final Boolean ROUTER = ((bitmap) & (1<<5)) != 0;
-        final Boolean HOP = ((bitmap) & (1<<6)) != 0;
-        final Boolean UNREP = ((bitmap) & (1<<7)) != 0;
-        final Boolean UNSEQ = ((bitmap) & (1<<8)) != 0;
-        pseudoBuilder.setPseudoField(new Ipv6ExthdrFlags(AUTH, DEST, ESP, FRAG, HOP, NONEXT, ROUTER, UNREP, UNSEQ));
+        final Boolean nonext = ((bitmap) & (1<<0)) != 0;
+        final Boolean esp = ((bitmap) & (1<<1)) != 0;
+        final Boolean auth = ((bitmap) & (1<<2)) != 0;
+        final Boolean dest = ((bitmap) & (1<<3)) != 0;
+        final Boolean frag = ((bitmap) & (1<<4)) != 0;
+        final Boolean router = ((bitmap) & (1<<5)) != 0;
+        final Boolean hop = ((bitmap) & (1<<6)) != 0;
+        final Boolean unrep = ((bitmap) & (1<<7)) != 0;
+        final Boolean unseq = ((bitmap) & (1<<8)) != 0;
+        pseudoBuilder.setPseudoField(new Ipv6ExthdrFlags(auth, dest, esp, frag, hop, nonext, router, unrep, unseq));
         builder.addAugmentation(PseudoFieldMatchEntry.class, pseudoBuilder.build());
     }