From d5b1c1faf513f1aba507c7728c9c2ef93ca9c4f3 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 7 Jul 2008 18:53:18 +0000 Subject: [PATCH] Generics. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@563 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/media/RegionManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/java/com/threerings/media/RegionManager.java b/src/java/com/threerings/media/RegionManager.java index 93cb82e7..643e2040 100644 --- a/src/java/com/threerings/media/RegionManager.java +++ b/src/java/com/threerings/media/RegionManager.java @@ -23,8 +23,9 @@ package com.threerings.media; import java.awt.EventQueue; import java.awt.Rectangle; -import java.util.ArrayList; +import java.util.List; +import com.google.common.collect.Lists; import com.samskivert.util.StringUtil; import static com.threerings.resource.Log.log; @@ -124,15 +125,15 @@ public class RegionManager */ public Rectangle[] getDirtyRegions () { - ArrayList merged = new ArrayList(); + List merged = Lists.newArrayList(); for (int ii = _dirty.size() - 1; ii >= 0; ii--) { // pop the next rectangle from the dirty list - Rectangle mr = (Rectangle)_dirty.remove(ii); + Rectangle mr = _dirty.remove(ii); // merge in any overlapping rectangles for (int jj = ii - 1; jj >= 0; jj--) { - Rectangle r = (Rectangle)_dirty.get(jj); + Rectangle r = _dirty.get(jj); if (mr.intersects(r)) { // remove the overlapping rectangle from the list _dirty.remove(jj); @@ -152,5 +153,5 @@ public class RegionManager } /** A list of dirty rectangles. */ - protected ArrayList _dirty = new ArrayList(); + protected List _dirty = Lists.newArrayList(); }