commit b29e62622f68bfe3aa4516e81ff29fe3b18e9cf8
author Ray Milkey <ray@onlab.us> Wed Apr 09 16:02:14 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Thu Apr 10 10:13:38 2014 -0700
tree 9493597032253ae6ebdda974541cb2740a9a7862
parent 4e7c22e2b5b48131424299ffc215cbfd2e4edbb3

Enable checkstyle check for blocks without braces.

Enable the checkstyle rule to check for block statements
without curly braces and fix any violations it finds.

Change-Id: Id4c58cea26f0d9ce7ed78643a4943c042886a12d

src/main/java/net/onrc/onos/core/devicemanager/OnosDevice.java

diff --git a/src/main/java/net/onrc/onos/core/devicemanager/OnosDevice.java b/src/main/java/net/onrc/onos/core/devicemanager/OnosDevice.java
index adac787..09dea03 100644
--- a/src/main/java/net/onrc/onos/core/devicemanager/OnosDevice.java
+++ b/src/main/java/net/onrc/onos/core/devicemanager/OnosDevice.java
@@ -149,8 +149,9 @@
     public void setLastSeenTimestamp(Date lastSeenTimestamp) {
         if (activeSince == null ||
                 (activeSince.getTime() + ACTIVITY_TIMEOUT) <
-                        lastSeenTimestamp.getTime())
+                        lastSeenTimestamp.getTime()) {
             this.activeSince = lastSeenTimestamp;
+        }
         this.lastSeenTimestamp = lastSeenTimestamp;
     }
 
@@ -164,7 +165,9 @@
 
     @Override
     public int hashCode() {
-        if (hashCode != 0) return hashCode;
+        if (hashCode != 0) {
+            return hashCode;
+        }
         final int prime = 31;
         hashCode = 1;
         hashCode = prime * hashCode
@@ -178,22 +181,46 @@
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null) return false;
-        if (getClass() != obj.getClass()) return false;
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
         OnosDevice other = (OnosDevice) obj;
-        if (hashCode() != other.hashCode()) return false;
+        if (hashCode() != other.hashCode()) {
+            return false;
+        }
         if (ipv4Address == null) {
-            if (other.ipv4Address != null) return false;
-        } else if (!ipv4Address.equals(other.ipv4Address)) return false;
+            if (other.ipv4Address != null) {
+                return false;
+            }
+        } else if (!ipv4Address.equals(other.ipv4Address)) {
+            return false;
+        }
         if (macAddress == null) {
-            if (other.macAddress != null) return false;
-        } else if (!macAddress.equals(other.macAddress)) return false;
-        if (switchDPID != other.switchDPID) return false;
-        if (switchPort != other.switchPort) return false;
+            if (other.macAddress != null) {
+                return false;
+            }
+        } else if (!macAddress.equals(other.macAddress)) {
+            return false;
+        }
+        if (switchDPID != other.switchDPID) {
+            return false;
+        }
+        if (switchPort != other.switchPort) {
+            return false;
+        }
         if (vlan == null) {
-            if (other.vlan != null) return false;
-        } else if (!vlan.equals(other.vlan)) return false;
+            if (other.vlan != null) {
+                return false;
+            }
+        } else if (!vlan.equals(other.vlan)) {
+            return false;
+        }
         return true;
     }