AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a safe comparison instead of simple subtraction.

Browse Source 
Vilya's ScoreAnimation sets its render order to Integer.MAX_VALUE; using this comparison method gets
the AbstractMediaManager's _media out of order when such values are used.
This commit is contained in:
Nathan Curtis
2012-08-07 17:43:41 -07:00
parent 760eed0fe0
commit 5a1cc88744
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/media/AbstractMedia.java
+3 -1
View File
@@ -27,6 +27,8 @@ import java.awt.geom.PathIterator;
import java.awt.geom.Point2D; import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D; import java.awt.geom.Rectangle2D;
import com.google.common.primitives.Ints;
import com.samskivert.util.ObserverList; import com.samskivert.util.ObserverList;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -164,7 +166,7 @@ public abstract class AbstractMedia
*/ */
public int renderCompareTo (AbstractMedia other) public int renderCompareTo (AbstractMedia other)
{ {
int result = _renderOrder - other._renderOrder; int result = Ints.compare(_renderOrder, other._renderOrder);
return (result != 0) ? result : naturalCompareTo(other); return (result != 0) ? result : naturalCompareTo(other);
} }