archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 18:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

4497648: TextLayout equals method is not implemented

Browse source 
Reviewed-by: serb, psadhukhan
This commit is contained in:
Phil Race 2016-06-23 16:54:19 -07:00
parent 1d8080cca9
commit 62f4383578
3 changed files with 57 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

42
jdk/src/java.desktop/share/classes/java/awt/font/TextLayout.java
View file

@ -248,7 +248,6 @@ public final class TextLayout implements Cloneable {
// all are recomputed from scratch in buildCache()
private TextLine.TextLineMetrics lineMetrics = null;
private float visibleAdvance;
private int hashCodeCache;
/*
* TextLayouts are supposedly immutable. If you mutate a TextLayout under
@ -722,9 +721,6 @@ public final class TextLayout implements Cloneable {
naturalBounds = null;
boundsRect = null;
// hashCode will be regenerated on demand
hashCodeCache = 0;
cacheIsValid = true;
}
@ -2568,34 +2564,9 @@ public final class TextLayout implements Cloneable {
return hitTestChar(x, y, getNaturalBounds());
}
/**
* Returns the hash code of this {@code TextLayout}.
* @return the hash code of this {@code TextLayout}.
*/
public int hashCode() {
if (hashCodeCache == 0) {
ensureCache();
hashCodeCache = textLine.hashCode();
}
return hashCodeCache;
}
/**
* Returns {@code true} if the specified {@code Object} is a
* {@code TextLayout} object and if the specified {@code Object}
* equals this {@code TextLayout}.
* @param obj an {@code Object} to test for equality
* @return {@code true} if the specified {@code Object}
* equals this {@code TextLayout}; {@code false}
* otherwise.
*/
public boolean equals(Object obj) {
return (obj instanceof TextLayout) && equals((TextLayout)obj);
}
/**
* Returns {@code true} if the two layouts are equal.
* Two layouts are equal if they contain equal glyphvectors in the same order.
* Obeys the general contract of {@link java.lang.Object equals(Object)}.
* @param rhs the {@code TextLayout} to compare to this
* {@code TextLayout}
* @return {@code true} if the specified {@code TextLayout}
@ -2603,16 +2574,7 @@ public final class TextLayout implements Cloneable {
*
*/
public boolean equals(TextLayout rhs) {
if (rhs == null) {
return false;
}
if (rhs == this) {
return true;
}
ensureCache();
return textLine.equals(rhs.textLine);
return equals((Object)rhs);
}
/**