From 9419a58b87ae0355974df26d16ae7492fc0ea27b Mon Sep 17 00:00:00 2001 From: Bruno Garcia Date: Fri, 17 Jun 2011 22:17:04 +0000 Subject: [PATCH] ArrayUtil --> Arrays. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1096 c613c5cb-e716-0410-b11b-feb51c14d237 --- src/main/as/com/threerings/parlor/card/data/Deck.as | 4 ++-- src/main/as/com/threerings/parlor/client/ParlorDirector.as | 4 ++-- src/main/as/com/threerings/parlor/client/TableDirector.as | 4 ++-- src/main/as/com/threerings/parlor/data/Table.as | 4 ++-- src/main/as/com/threerings/parlor/game/data/GameObject.as | 6 +++--- .../as/com/threerings/whirled/spot/data/SpotSceneModel.as | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/as/com/threerings/parlor/card/data/Deck.as b/src/main/as/com/threerings/parlor/card/data/Deck.as index f3603b31..fbbe66bf 100644 --- a/src/main/as/com/threerings/parlor/card/data/Deck.as +++ b/src/main/as/com/threerings/parlor/card/data/Deck.as @@ -21,7 +21,7 @@ package com.threerings.parlor.card.data { -import com.threerings.util.ArrayUtil; +import com.threerings.util.Arrays; import com.threerings.util.StreamableArrayList; /** @@ -101,7 +101,7 @@ public class Deck extends StreamableArrayList */ public function shuffle () :void { - ArrayUtil.shuffle(_array); + Arrays.shuffle(_array); } } } diff --git a/src/main/as/com/threerings/parlor/client/ParlorDirector.as b/src/main/as/com/threerings/parlor/client/ParlorDirector.as index cd84489b..519e446f 100644 --- a/src/main/as/com/threerings/parlor/client/ParlorDirector.as +++ b/src/main/as/com/threerings/parlor/client/ParlorDirector.as @@ -21,7 +21,7 @@ package com.threerings.parlor.client { -import com.threerings.util.ArrayUtil; +import com.threerings.util.Arrays; import com.threerings.util.Map; import com.threerings.util.Maps; import com.threerings.util.Log; @@ -93,7 +93,7 @@ public class ParlorDirector extends BasicDirector */ public function removeGameReadyObserver (observer :GameReadyObserver) :void { - ArrayUtil.removeFirst(_grobs, observer); + Arrays.removeFirst(_grobs, observer); } /** diff --git a/src/main/as/com/threerings/parlor/client/TableDirector.as b/src/main/as/com/threerings/parlor/client/TableDirector.as index 59aafb6e..e0507234 100644 --- a/src/main/as/com/threerings/parlor/client/TableDirector.as +++ b/src/main/as/com/threerings/parlor/client/TableDirector.as @@ -21,7 +21,7 @@ package com.threerings.parlor.client { -import com.threerings.util.ArrayUtil; +import com.threerings.util.Arrays; import com.threerings.util.Log; import com.threerings.util.Name; import com.threerings.util.ObserverList; @@ -376,7 +376,7 @@ public class TableDirector extends BasicDirector // look for our username in the players array var self :BodyObject = (_pctx.getClient().getClientObject() as BodyObject); - if (ArrayUtil.contains(table.players, self.getVisibleName())) { + if (Arrays.contains(table.players, self.getVisibleName())) { _ourTable = table; } diff --git a/src/main/as/com/threerings/parlor/data/Table.as b/src/main/as/com/threerings/parlor/data/Table.as index 2a20bf33..a6eb58d9 100644 --- a/src/main/as/com/threerings/parlor/data/Table.as +++ b/src/main/as/com/threerings/parlor/data/Table.as @@ -21,7 +21,7 @@ package com.threerings.parlor.data { -import com.threerings.util.ArrayUtil; +import com.threerings.util.Arrays; import com.threerings.util.ClassUtil; import com.threerings.util.Hashable; import com.threerings.util.Joiner; @@ -133,7 +133,7 @@ public class Table for (var jj :int = 0; jj < subTeams.length; jj++) { var occ :Name = (players[(subTeams[jj] as int)] as Name); if (occ != null) { - newSubTeams.push(ArrayUtil.indexOf(players, occ)); + newSubTeams.push(Arrays.indexOf(players, occ)); } } newSubTeams.sort(null, Array.NUMERIC); diff --git a/src/main/as/com/threerings/parlor/game/data/GameObject.as b/src/main/as/com/threerings/parlor/game/data/GameObject.as index 04d741ca..5630ea76 100644 --- a/src/main/as/com/threerings/parlor/game/data/GameObject.as +++ b/src/main/as/com/threerings/parlor/game/data/GameObject.as @@ -21,7 +21,7 @@ package com.threerings.parlor.game.data { -import com.threerings.util.ArrayUtil; +import com.threerings.util.Arrays; import com.threerings.util.Integer; import com.threerings.util.Joiner; import com.threerings.util.langBoolean; @@ -157,7 +157,7 @@ public class GameObject extends PlaceObject */ public function getPlayerIndex (username :Name) :int { - return ArrayUtil.indexOf(players, username); + return Arrays.indexOf(players, username); } /** @@ -218,7 +218,7 @@ public class GameObject extends PlaceObject */ public function getWinnerIndex () :int { - return ArrayUtil.indexOf(winners, true); + return Arrays.indexOf(winners, true); } /** diff --git a/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as b/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as index 543fb25d..ea9d6553 100644 --- a/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as +++ b/src/main/as/com/threerings/whirled/spot/data/SpotSceneModel.as @@ -21,7 +21,7 @@ package com.threerings.whirled.spot.data { -import com.threerings.util.ArrayUtil; +import com.threerings.util.Arrays; import com.threerings.util.ClassUtil; import com.threerings.io.ObjectInputStream; @@ -75,7 +75,7 @@ public class SpotSceneModel extends SimpleStreamableObject */ public function removePortal (portal :Portal) :void { - ArrayUtil.removeFirst(portals, portal); + Arrays.removeFirst(portals, portal); } /**