From 2d19a0ba82d2aa65a5a3b5329ba6386ee13f585c Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 15 Mar 2005 02:12:03 +0000 Subject: [PATCH] Renamed DSet.entries() -> DSet.iterator(). git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3406 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/client/OccupantDirector.java | 2 +- src/java/com/threerings/crowd/data/PlaceObject.java | 2 +- src/java/com/threerings/crowd/server/PlaceManager.java | 2 +- src/java/com/threerings/micasa/client/OccupantList.java | 4 ++-- src/java/com/threerings/micasa/lobby/table/TableListView.java | 2 +- .../com/threerings/presents/client/InvocationDirector.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/java/com/threerings/crowd/client/OccupantDirector.java b/src/java/com/threerings/crowd/client/OccupantDirector.java index 3e9fea616..07afd1cad 100644 --- a/src/java/com/threerings/crowd/client/OccupantDirector.java +++ b/src/java/com/threerings/crowd/client/OccupantDirector.java @@ -113,7 +113,7 @@ public class OccupantDirector extends BasicDirector return null; } - Iterator iter = _place.occupantInfo.entries(); + Iterator iter = _place.occupantInfo.iterator(); while (iter.hasNext()) { OccupantInfo info = (OccupantInfo)iter.next(); if (info.username.equals(username)) { diff --git a/src/java/com/threerings/crowd/data/PlaceObject.java b/src/java/com/threerings/crowd/data/PlaceObject.java index 6800aed7a..e932f6a55 100644 --- a/src/java/com/threerings/crowd/data/PlaceObject.java +++ b/src/java/com/threerings/crowd/data/PlaceObject.java @@ -93,7 +93,7 @@ public class PlaceObject extends DObject public OccupantInfo getOccupantInfo (Name username) { try { - Iterator iter = occupantInfo.entries(); + Iterator iter = occupantInfo.iterator(); while (iter.hasNext()) { OccupantInfo info = (OccupantInfo)iter.next(); if (info.username.equals(username)) { diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java index 91ae053fe..28aba608f 100644 --- a/src/java/com/threerings/crowd/server/PlaceManager.java +++ b/src/java/com/threerings/crowd/server/PlaceManager.java @@ -130,7 +130,7 @@ public class PlaceManager public void applyToOccupants (OccupantOp op) { if (_plobj != null) { - Iterator iter = _plobj.occupantInfo.entries(); + Iterator iter = _plobj.occupantInfo.iterator(); while (iter.hasNext()) { op.apply((OccupantInfo)iter.next()); } diff --git a/src/java/com/threerings/micasa/client/OccupantList.java b/src/java/com/threerings/micasa/client/OccupantList.java index 82f8aaa1f..ca08e4ecb 100644 --- a/src/java/com/threerings/micasa/client/OccupantList.java +++ b/src/java/com/threerings/micasa/client/OccupantList.java @@ -1,5 +1,5 @@ // -// $Id: OccupantList.java,v 1.9 2004/11/15 01:47:52 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -59,7 +59,7 @@ public class OccupantList public void willEnterPlace (PlaceObject plobj) { // add all of the occupants of the place to our list - Iterator users = plobj.occupantInfo.entries(); + Iterator users = plobj.occupantInfo.iterator(); while (users.hasNext()) { OccupantInfo info = (OccupantInfo)users.next(); _model.addElement(info.username); diff --git a/src/java/com/threerings/micasa/lobby/table/TableListView.java b/src/java/com/threerings/micasa/lobby/table/TableListView.java index dcae983d3..9099fcc68 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableListView.java +++ b/src/java/com/threerings/micasa/lobby/table/TableListView.java @@ -140,7 +140,7 @@ public class TableListView extends JPanel // iterate over the tables already active in this lobby and put // them in their respective lists TableLobbyObject tlobj = (TableLobbyObject)place; - Iterator iter = tlobj.tableSet.entries(); + Iterator iter = tlobj.tableSet.iterator(); while (iter.hasNext()) { tableAdded((Table)iter.next()); } diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/java/com/threerings/presents/client/InvocationDirector.java index 98fe77317..59fd655e5 100644 --- a/src/java/com/threerings/presents/client/InvocationDirector.java +++ b/src/java/com/threerings/presents/client/InvocationDirector.java @@ -1,5 +1,5 @@ // -// $Id: InvocationDirector.java,v 1.34 2004/08/27 02:20:18 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -363,7 +363,7 @@ public class InvocationDirector _clobj.startTransaction(); try { _clobj.setReceivers(new DSet()); - Iterator iter = receivers.entries(); + Iterator iter = receivers.iterator(); while (iter.hasNext()) { _clobj.addToReceivers((Registration)iter.next()); }