organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-16 02:07:15 +00:00
Code Issues1 Projects Releases Wiki Activity Actions10

ICU-12716 Fixes to remove ReferenceEquality warnings on compile

Browse source 
X-SVN-Rev: 39371
This commit is contained in:
Craig Cornelius 2016-09-28 00:39:19 +00:00
parent 2049f6f415
commit f6e18517b1
4 changed files with 11 additions and 11 deletions

2
icu4j/main/classes/core/src/com/ibm/icu/impl/TimeZoneNamesImpl.java
View file

@ -655,7 +655,7 @@ public class TimeZoneNamesImpl extends TimeZoneNames {
}
private String[] getNames() {
if (names == null) {
if (Utility.sameObjects(names, null)) {
return null;
}
int length = 0;

16
icu4j/main/classes/core/src/com/ibm/icu/impl/UnicodeSetStringSpan.java
View file

@ -214,7 +214,7 @@ public class UnicodeSetStringSpan {
maxLength16 = otherStringSpan.maxLength16;
someRelevant = otherStringSpan.someRelevant;
all = true;
if (otherStringSpan.spanNotSet == otherStringSpan.spanSet) {
if (Utility.sameObjects(otherStringSpan.spanNotSet, otherStringSpan.spanSet)) {
spanNotSet = spanSet;
} else {
spanNotSet = (UnicodeSet) otherStringSpan.spanNotSet.clone();
@ -226,7 +226,7 @@ public class UnicodeSetStringSpan {
/**
* Do the strings need to be checked in span() etc.?
*
*
* @return true if strings need to be checked (call span() here),
* false if not (use a BMPSet for best performance).
*/
@ -244,7 +244,7 @@ public class UnicodeSetStringSpan {
* so that a character span ends before any string.
*/
private void addToSpanNotSet(int c) {
if (spanNotSet == null || spanNotSet == spanSet) {
if (Utility.sameObjects(spanNotSet, null) || Utility.sameObjects(spanNotSet, spanSet)) {
if (spanSet.contains(c)) {
return; // Nothing to do.
}
@ -269,7 +269,7 @@ public class UnicodeSetStringSpan {
/*
* Algorithm for span(SpanCondition.CONTAINED)
*
*
* Theoretical algorithm:
* - Iterate through the string, and at each code point boundary:
* + If the code point there is in the set, then remember to continue after it.
@ -322,7 +322,7 @@ public class UnicodeSetStringSpan {
/*
* Algorithm for span(SIMPLE)
*
*
* Theoretical algorithm:
* - Iterate through the string, and at each code point boundary:
* + If the code point there is in the set, then remember to continue after it.
@ -358,7 +358,7 @@ public class UnicodeSetStringSpan {
*/
/**
* Spans a string.
*
*
* @param s The string to be spanned
* @param start The start index that the span begins
* @param spanCondition The span condition
@ -637,7 +637,7 @@ public class UnicodeSetStringSpan {
/**
* Span a string backwards.
*
*
* @param s The string to be spanned
* @param spanCondition The span condition
* @return The string index which starts the span (i.e. inclusive).
@ -806,7 +806,7 @@ public class UnicodeSetStringSpan {
/**
* Algorithm for spanNot()==span(SpanCondition.NOT_CONTAINED)
*
*
* Theoretical algorithm:
* - Iterate through the string, and at each code point boundary:
* + If the code point there is in the set, then return with the current position.

2
icu4j/main/classes/core/src/com/ibm/icu/text/CurrencyMetaInfo.java
View file

@ -320,7 +320,7 @@ public class CurrencyMetaInfo {
* @stable ICU 4.4
*/
public boolean equals(CurrencyFilter rhs) {
return this == rhs || (rhs != null &&
return Utility.sameObjects(this, rhs) || (rhs != null &&
equals(this.region, rhs.region) &&
equals(this.currency, rhs.currency) &&
this.from == rhs.from &&

2
icu4j/main/classes/core/src/com/ibm/icu/text/UnicodeSet.java
View file

@ -3232,7 +3232,7 @@ public class UnicodeSet extends UnicodeFilter implements Iterable<String>, Compa
VersionInfo v = UCharacter.getAge(ch);
// Reference comparison ok; VersionInfo caches and reuses
// unique objects.
return v != NO_VERSION &&
return !Utility.sameObjects(v, NO_VERSION) &&
v.compareTo(version) <= 0;
}
}