diff --git a/src/java/com/threerings/ezgame/server/DictionaryManager.java b/src/java/com/threerings/ezgame/server/DictionaryManager.java index 308e12e1..961a28a5 100644 --- a/src/java/com/threerings/ezgame/server/DictionaryManager.java +++ b/src/java/com/threerings/ezgame/server/DictionaryManager.java @@ -242,7 +242,7 @@ public class DictionaryManager for (Character key : keys) { keycount--; - _letters[keycount] = (char) key; + _letters[keycount] = key; _counts[keycount] = ((float) letters.getCount(key)) / total; // normalize } } diff --git a/src/java/com/threerings/parlor/turn/client/TurnDisplay.java b/src/java/com/threerings/parlor/turn/client/TurnDisplay.java index 43109cd2..fdf749a5 100644 --- a/src/java/com/threerings/parlor/turn/client/TurnDisplay.java +++ b/src/java/com/threerings/parlor/turn/client/TurnDisplay.java @@ -183,11 +183,11 @@ public class TurnDisplay extends JPanel { String name = event.getName(); if (name.equals(_turnObj.getTurnHolderFieldName())) { - JLabel oldLabel = (JLabel) _labels.get((Name) event.getOldValue()); + JLabel oldLabel = _labels.get(event.getOldValue()); if (oldLabel != null) { oldLabel.setIcon(null); } - JLabel newLabel = (JLabel) _labels.get((Name) event.getValue()); + JLabel newLabel = _labels.get(event.getValue()); if (newLabel != null) { newLabel.setIcon(_turnIcon); } @@ -213,7 +213,7 @@ public class TurnDisplay extends JPanel protected TurnGameObject _turnObj; /** A mapping of the labels currently associated with each player. */ - protected HashMap _labels = new HashMap(); + protected HashMap _labels = new HashMap(); /** The game-specified player icons. */ protected Icon[] _playerIcons; diff --git a/src/java/com/threerings/stage/data/StageLocation.java b/src/java/com/threerings/stage/data/StageLocation.java index 694e3d44..cc59e8ef 100644 --- a/src/java/com/threerings/stage/data/StageLocation.java +++ b/src/java/com/threerings/stage/data/StageLocation.java @@ -116,7 +116,7 @@ public class StageLocation extends SimpleStreamableObject public Object clone () { try { - return (StageLocation)super.clone(); + return super.clone(); } catch (CloneNotSupportedException cnse) { throw new RuntimeException(cnse); } diff --git a/src/java/com/threerings/stage/data/StageMisoSceneModel.java b/src/java/com/threerings/stage/data/StageMisoSceneModel.java index 5250b52b..600fd241 100644 --- a/src/java/com/threerings/stage/data/StageMisoSceneModel.java +++ b/src/java/com/threerings/stage/data/StageMisoSceneModel.java @@ -77,6 +77,6 @@ public class StageMisoSceneModel extends SparseMisoSceneModel */ public Section getSection (int key) { - return (Section)_sections.get(key); + return _sections.get(key); } } diff --git a/src/java/com/threerings/stage/util/PlacementConstraints.java b/src/java/com/threerings/stage/util/PlacementConstraints.java index bc3cf805..f0b9cabf 100644 --- a/src/java/com/threerings/stage/util/PlacementConstraints.java +++ b/src/java/com/threerings/stage/util/PlacementConstraints.java @@ -167,7 +167,7 @@ public class PlacementConstraints } ObjectData[] data = new ObjectData[info.length]; for (int ii = 0; ii < info.length; ii++) { - data[ii] = (ObjectData)_objectData.get(info[ii]); + data[ii] = _objectData.get(info[ii]); if (data[ii] == null) { Log.warning("Couldn't match object info up to data [info=" + info[ii] + "]."); @@ -570,7 +570,7 @@ public class PlacementConstraints /** For all objects in the scene, maps {@link ObjectInfo}s to * {@link ObjectData}s. */ - protected HashMap _objectData = new HashMap(); + protected HashMap _objectData = new HashMap(); /** One rectangle we'll re-use for all constraints ops. */ protected static final Rectangle _constrainRect = new Rectangle(); diff --git a/src/java/com/threerings/whirled/server/SceneRegistry.java b/src/java/com/threerings/whirled/server/SceneRegistry.java index dcff736b..b01f7290 100644 --- a/src/java/com/threerings/whirled/server/SceneRegistry.java +++ b/src/java/com/threerings/whirled/server/SceneRegistry.java @@ -111,14 +111,14 @@ public class SceneRegistry } /** - * Fetches the scene manager assosciated with the specified scene. + * Fetches the scene manager associated with the specified scene. * * @return the scene manager for the specified scene or null if no scene manager is loaded for * that scene. */ public SceneManager getSceneManager (int sceneId) { - return (SceneManager)_scenemgrs.get(sceneId); + return _scenemgrs.get(sceneId); } /** @@ -151,7 +151,7 @@ public class SceneRegistry */ public void resolveScene (int sceneId, ResolutionListener target) { - SceneManager mgr = (SceneManager)_scenemgrs.get(sceneId); + SceneManager mgr = _scenemgrs.get(sceneId); if (mgr != null) { // if the scene is already resolved, we're ready to roll target.sceneWasResolved(mgr); @@ -164,7 +164,7 @@ public class SceneRegistry // otherwise we've got to resolve the scene and call them back later; we can manipulate the // penders table with impunity here because we only do so on the dobjmgr thread - ArrayList penders = (ArrayList)_penders.get(sceneId); + ArrayList penders = _penders.get(sceneId); // if we're already in the process of resolving this scene, just add these guys to the list // to be notified when it finally is resolved @@ -173,7 +173,7 @@ public class SceneRegistry } else { // otherwise we've got to initiate the resolution process, create the penders list - _penders.put(sceneId, penders = new ArrayList()); + _penders.put(sceneId, penders = new ArrayList()); penders.add(target); // i don't like cluttering up method declarations with final keywords... @@ -272,7 +272,7 @@ public class SceneRegistry } }); - // when the scene manager completes its startup procedings, it will call back to the + // when the scene manager completes its startup proceedings, it will call back to the // scene registry and let us know that we can turn the penders loose } catch (Exception e) { @@ -293,10 +293,9 @@ public class SceneRegistry } // alas things didn't work out, notify our penders - ArrayList penders = (ArrayList)_penders.remove(sceneId); + ArrayList penders = _penders.remove(sceneId); if (penders != null) { - for (int i = 0; i < penders.size(); i++) { - ResolutionListener rl = (ResolutionListener)penders.get(i); + for (ResolutionListener rl : penders) { try { rl.sceneFailedToResolve(sceneId, cause); } catch (Exception e) { @@ -322,10 +321,9 @@ public class SceneRegistry } // now notify any penders - ArrayList penders = (ArrayList)_penders.remove(sceneId); + ArrayList penders = _penders.remove(sceneId); if (penders != null) { - for (int i = 0; i < penders.size(); i++) { - ResolutionListener rl = (ResolutionListener)penders.get(i); + for (ResolutionListener rl : penders) { try { rl.sceneWasResolved(scmgr); } catch (Exception e) { @@ -361,8 +359,9 @@ public class SceneRegistry protected SceneFactory _scfact; /** A mapping from scene ids to scene managers. */ - protected HashIntMap _scenemgrs = new HashIntMap(); + protected HashIntMap _scenemgrs = new HashIntMap(); /** The table of pending resolution listeners. */ - protected HashIntMap _penders = new HashIntMap(); + protected HashIntMap> _penders = + new HashIntMap>(); }