From bfe9cbba04172561bfedc51e80107c14decfd689 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Sun, 22 Feb 2004 18:52:33 +0000 Subject: [PATCH] Changed the variable named "enum", since that's a keyword in jdk 1.5 git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2964 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/crowd/server/PlaceRegistry.java | 8 ++++---- .../com/threerings/presents/server/PresentsClient.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/java/com/threerings/crowd/server/PlaceRegistry.java b/src/java/com/threerings/crowd/server/PlaceRegistry.java index 4658d03be..4b831a54a 100644 --- a/src/java/com/threerings/crowd/server/PlaceRegistry.java +++ b/src/java/com/threerings/crowd/server/PlaceRegistry.java @@ -1,5 +1,5 @@ // -// $Id: PlaceRegistry.java,v 1.26 2003/08/09 04:56:35 mdb Exp $ +// $Id: PlaceRegistry.java,v 1.27 2004/02/22 18:52:33 ray Exp $ package com.threerings.crowd.server; @@ -144,16 +144,16 @@ public class PlaceRegistry */ public Iterator enumeratePlaces () { - final Iterator enum = _pmgrs.elements(); + final Iterator itr = _pmgrs.elements(); return new Iterator() { public boolean hasNext () { - return enum.hasNext(); + return itr.hasNext(); } public Object next () { - PlaceManager plmgr = (PlaceManager)enum.next(); + PlaceManager plmgr = (PlaceManager)itr.next(); return (plmgr == null) ? null : plmgr.getPlaceObject(); } diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index c07e53b30..46e21ac37 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -1,5 +1,5 @@ // -// $Id: PresentsClient.java,v 1.63 2004/02/21 00:54:51 mdb Exp $ +// $Id: PresentsClient.java,v 1.64 2004/02/22 18:52:33 ray Exp $ package com.threerings.presents.server; @@ -463,8 +463,8 @@ public class PresentsClient */ protected void clearSubscrips (boolean verbose) { - for (Iterator enum = _subscrips.elements(); enum.hasNext(); ) { - DObject object = (DObject)enum.next(); + for (Iterator itr = _subscrips.elements(); itr.hasNext(); ) { + DObject object = (DObject)itr.next(); if (verbose) { Log.info("Clearing subscription [client=" + this + ", obj=" + object.getOid() + "].");