From d93aa839d3adf55b916960fcf101e49470358789 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 27 May 2009 17:45:07 +0000 Subject: [PATCH] Use a googley Predicate, not a samskivert Predicate. Sorry for the pain and suffering. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@828 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/media/sprite/SpriteManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/media/sprite/SpriteManager.java b/src/java/com/threerings/media/sprite/SpriteManager.java index e028baca..420268e7 100644 --- a/src/java/com/threerings/media/sprite/SpriteManager.java +++ b/src/java/com/threerings/media/sprite/SpriteManager.java @@ -28,7 +28,8 @@ import java.util.List; import java.awt.Graphics2D; import java.awt.Shape; -import com.samskivert.util.Predicate; +import com.google.common.base.Predicate; + import com.samskivert.util.SortableArrayList; import com.threerings.media.AbstractMedia; @@ -148,7 +149,7 @@ public class SpriteManager extends AbstractMediaManager int idxoff = 0; for (int ii = 0, ll = _sprites.size(); ii < ll; ii++) { Sprite sprite = _sprites.get(ii-idxoff); - if (pred.isMatch(sprite)) { + if (pred.apply(sprite)) { _sprites.remove(sprite); sprite.invalidate(); sprite.shutdown();