From f54136e6f685aeafb8cee301ef7aea001cd238c3 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 27 Oct 2009 16:53:15 -0700 Subject: Fix a few FindBugs warnings in code that isn't upstream. Bugs: 2099642, 2099637 --- icu/src/main/java/com/ibm/icu4jni/text/BreakIterator.java | 8 ++++---- icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java | 2 +- icu/src/main/java/com/ibm/icu4jni/text/DecimalFormatSymbols.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'icu/src/main/java') diff --git a/icu/src/main/java/com/ibm/icu4jni/text/BreakIterator.java b/icu/src/main/java/com/ibm/icu4jni/text/BreakIterator.java index c8f5372..5ef1161 100644 --- a/icu/src/main/java/com/ibm/icu4jni/text/BreakIterator.java +++ b/icu/src/main/java/com/ibm/icu4jni/text/BreakIterator.java @@ -22,10 +22,10 @@ import java.util.Locale; public abstract class BreakIterator implements Cloneable { - protected static int BI_CHAR_INSTANCE = 1; - protected static int BI_WORD_INSTANCE = 2; - protected static int BI_LINE_INSTANCE = 3; - protected static int BI_SENT_INSTANCE = 4; + protected static final int BI_CHAR_INSTANCE = 1; + protected static final int BI_WORD_INSTANCE = 2; + protected static final int BI_LINE_INSTANCE = 3; + protected static final int BI_SENT_INSTANCE = 4; protected int type = 0; diff --git a/icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java b/icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java index 7e8a000..9e9401d 100644 --- a/icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java +++ b/icu/src/main/java/com/ibm/icu4jni/text/CollationKey.java @@ -122,7 +122,7 @@ public final class CollationKey implements Comparable { if (m_hash_ == 0) { - if (m_bytes_ != null || m_bytes_.length != 0) + if (m_bytes_ != null && m_bytes_.length != 0) { int len = m_bytes_.length; int inc = ((len - 32) / 32) + 1; diff --git a/icu/src/main/java/com/ibm/icu4jni/text/DecimalFormatSymbols.java b/icu/src/main/java/com/ibm/icu4jni/text/DecimalFormatSymbols.java index 98463e4..ebda335 100644 --- a/icu/src/main/java/com/ibm/icu4jni/text/DecimalFormatSymbols.java +++ b/icu/src/main/java/com/ibm/icu4jni/text/DecimalFormatSymbols.java @@ -24,7 +24,7 @@ import java.util.Currency; import java.util.Locale; import java.util.ResourceBundle; -public class DecimalFormatSymbols { +public class DecimalFormatSymbols implements Cloneable { private int addr; -- cgit v1.1