organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 15:42:14 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-21561 rename StringSegment.equals() to contentEquals()

Browse source 
and remove hashCode() because of now-missing equals() and because
StringSegment is mutable and documented as not suitable for HashMaps
This commit is contained in:
Markus Scherer 2021-04-05 14:47:42 -07:00
parent c5406692bb
commit 928febc705
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
icu4j/main/classes/core/src/com/ibm/icu/impl/StringSegment.java
View file

@ -202,23 +202,13 @@ public class StringSegment implements CharSequence {
}
/**
* Equals any CharSequence with the same chars as this segment.
* Returns true if this segment contains the same characters as the other CharSequence.
*
* <p>
* This method does not perform case folding; if you want case-insensitive equality, use
* <p>This method does not perform case folding; if you want case-insensitive equality, use
* {@link #getCommonPrefixLength}.
*/
@Override
public boolean equals(Object other) {
if (!(other instanceof CharSequence))
return false;
return Utility.charSequenceEquals(this, (CharSequence) other);
}
/** Returns a hash code equivalent to calling .toString().hashCode() */
@Override
public int hashCode() {
return Utility.charSequenceHashCode(this);
public boolean contentEquals(CharSequence other) {
return Utility.charSequenceEquals(this, other);
}
/** Returns a string representation useful for debugging. */

2
icu4j/main/classes/core/src/com/ibm/icu/number/NumberSkeletonImpl.java
View file

@ -1368,7 +1368,7 @@ class NumberSkeletonImpl {
/** @return Whether we successfully found and parsed a trailing zero option. */
private static boolean parseTrailingZeroOption(StringSegment segment, MacroProps macros) {
if (segment.equals("w")) {
if (segment.contentEquals("w")) {
macros.precision = macros.precision.trailingZeroDisplay(TrailingZeroDisplay.HIDE_IF_WHOLE);
return true;
}

7
icu4j/main/tests/core/src/com/ibm/icu/dev/test/impl/StringSegmentTest.java
View file

@ -3,6 +3,8 @@
package com.ibm.icu.dev.test.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
@ -47,10 +49,15 @@ public class StringSegmentTest {
public void testCharAt() {
StringSegment segment = new StringSegment(SAMPLE_STRING, false);
assertCharSequenceEquals(SAMPLE_STRING, segment);
assertTrue(segment.contentEquals(SAMPLE_STRING));
segment.adjustOffset(3);
assertCharSequenceEquals("radio 📻", segment);
assertTrue(segment.contentEquals("radio 📻"));
assertFalse(segment.contentEquals(SAMPLE_STRING));
segment.setLength(5);
assertCharSequenceEquals("radio", segment);
assertTrue(segment.contentEquals("radio"));
assertFalse(segment.contentEquals(SAMPLE_STRING));
}
@Test