From cb547616aa48bc449f8478c445dc8928481762e8 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 9 Dec 2014 19:19:16 -0500 Subject: [PATCH] Fix checkstyle if-statements must use braces liblldp Change-Id: I2e36139dbeea5890a7eec7003da186af162e8998 Signed-off-by: Thanh Ha --- .../controller/liblldp/BitBufferHelper.java | 18 ++++++++++++------ .../controller/liblldp/DataLinkAddress.java | 15 ++++++++++----- .../controller/liblldp/EthernetAddress.java | 12 ++++++++---- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java index 3eae43212f..fc515e109d 100644 --- a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java +++ b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/BitBufferHelper.java @@ -359,8 +359,9 @@ public abstract class BitBufferHelper { int value = 0; for (int i = 0; i < length; i++) { value = array[i]; - if (value < 0) + if (value < 0) { value += 256; + } ret = ret | (long) ((long) value << ((length - i - 1) * NetUtils.NumBitsInAByte)); } @@ -390,8 +391,9 @@ public abstract class BitBufferHelper { for (int i = startOffset; i < array.length; i++) { value = array[i]; - if (value < 0) + if (value < 0) { value += 256; + } ret = ret | (long) ((long) value << ((array.length - i - 1) * NetUtils.NumBitsInAByte)); } @@ -637,8 +639,9 @@ public abstract class BitBufferHelper { } } else { for (i = 0; i < numBytes; i++) { - if (i != 0) + if (i != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(NetUtils.NumBitsInAByte - extraOffsetBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits @@ -648,16 +651,18 @@ public abstract class BitBufferHelper { InputMSBbits = InputLSBbits = 0; } if (RestBits < (NetUtils.NumBitsInAByte - extraOffsetBits)) { - if (numBytes != 0) + if (numBytes != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(RestBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits : InputMSBbits + 256; data[startByteOffset + i] = (byte) ((data[startByteOffset + i]) | (InputLSBbits << (NetUtils.NumBitsInAByte - extraOffsetBits)) | (InputMSBbits >> extraOffsetBits)); } else if (RestBits == (NetUtils.NumBitsInAByte - extraOffsetBits)) { - if (numBytes != 0) + if (numBytes != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(NetUtils.NumBitsInAByte - extraOffsetBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits @@ -665,8 +670,9 @@ public abstract class BitBufferHelper { data[startByteOffset + i] = (byte) (data[startByteOffset + i] | (InputLSBbits << (NetUtils.NumBitsInAByte - extraOffsetBits)) | (InputMSBbits >> extraOffsetBits)); } else { - if (numBytes != 0) + if (numBytes != 0) { InputLSBbits = (inputdata[i - 1] & getLSBMask(extraOffsetBits)); + } InputMSBbits = (byte) (inputdata[i] & (getMSBMask(NetUtils.NumBitsInAByte - extraOffsetBits))); InputMSBbits = (InputMSBbits >= 0) ? InputMSBbits diff --git a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java index d617c05a5a..cf56aebe60 100644 --- a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java +++ b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/DataLinkAddress.java @@ -74,18 +74,23 @@ abstract public class DataLinkAddress implements Serializable { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } DataLinkAddress other = (DataLinkAddress) obj; if (name == null) { - if (other.name != null) + if (other.name != null) { return false; - } else if (!name.equals(other.name)) + } + } else if (!name.equals(other.name)) { return false; + } return true; } diff --git a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java index b7b72cbffd..8c5f8b9ffd 100644 --- a/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java +++ b/opendaylight/commons/liblldp/src/main/java/org/opendaylight/controller/liblldp/EthernetAddress.java @@ -99,15 +99,19 @@ public class EthernetAddress extends DataLinkAddress { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (!super.equals(obj)) + } + if (!super.equals(obj)) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } EthernetAddress other = (EthernetAddress) obj; - if (!Arrays.equals(macAddress, other.macAddress)) + if (!Arrays.equals(macAddress, other.macAddress)) { return false; + } return true; } -- 2.36.6