From 707ebe5e5adf1dff9cbf9f38a5aed7e9562c1962 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Mon, 17 Aug 2009 21:46:05 +0000 Subject: [PATCH] Prune spurious semicolons & redundant implementation declarations git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@849 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/cast/CompositedMaskedImage.java | 2 +- src/java/com/threerings/cast/CompositedMultiFrameImage.java | 2 +- src/java/com/threerings/cast/CompositedShadowImage.java | 2 +- src/java/com/threerings/media/FrameManager.java | 2 +- src/java/com/threerings/media/tile/bundle/TileSetBundle.java | 4 +--- src/java/com/threerings/miso/client/SceneObject.java | 2 +- src/java/com/threerings/miso/client/TilePath.java | 3 --- src/java/com/threerings/openal/OpenALSoundPlayer.java | 2 +- src/java/com/threerings/openal/Stream.java | 2 +- src/java/com/threerings/util/BrowserUtil.java | 2 +- 10 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/java/com/threerings/cast/CompositedMaskedImage.java b/src/java/com/threerings/cast/CompositedMaskedImage.java index a85d46b7..f89c3ad5 100644 --- a/src/java/com/threerings/cast/CompositedMaskedImage.java +++ b/src/java/com/threerings/cast/CompositedMaskedImage.java @@ -139,4 +139,4 @@ public class CompositedMaskedImage extends CompositedMultiFrameImage protected int getY (int index) { return ((VolatileMirage)_images[index]).getY(); } -}; +} diff --git a/src/java/com/threerings/cast/CompositedMultiFrameImage.java b/src/java/com/threerings/cast/CompositedMultiFrameImage.java index f05f51bf..e14792e4 100644 --- a/src/java/com/threerings/cast/CompositedMultiFrameImage.java +++ b/src/java/com/threerings/cast/CompositedMultiFrameImage.java @@ -320,4 +320,4 @@ public class CompositedMultiFrameImage protected int _index; protected Point _origin = new Point(); } -}; +} diff --git a/src/java/com/threerings/cast/CompositedShadowImage.java b/src/java/com/threerings/cast/CompositedShadowImage.java index 97dd31f0..d5a78508 100644 --- a/src/java/com/threerings/cast/CompositedShadowImage.java +++ b/src/java/com/threerings/cast/CompositedShadowImage.java @@ -108,4 +108,4 @@ public class CompositedShadowImage extends CompositedMultiFrameImage /** The alpha value at which we render our shadow. */ protected AlphaComposite _shadowAlpha; -}; +} diff --git a/src/java/com/threerings/media/FrameManager.java b/src/java/com/threerings/media/FrameManager.java index 5214514a..d7fcd976 100644 --- a/src/java/com/threerings/media/FrameManager.java +++ b/src/java/com/threerings/media/FrameManager.java @@ -727,7 +727,7 @@ public abstract class FrameManager /** Used to compute metrics. */ protected long _lastTick; - }; + } /** The window into which we do our rendering. */ protected Window _window; diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java index 06b2f356..72455ea1 100644 --- a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java +++ b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java @@ -26,8 +26,6 @@ import java.util.Iterator; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.Serializable; - import java.awt.image.BufferedImage; import com.samskivert.util.HashIntMap; @@ -43,7 +41,7 @@ import com.threerings.media.tile.TileSet; * on the local filesystem. */ public class TileSetBundle extends HashIntMap - implements Serializable, ImageDataProvider + implements ImageDataProvider { /** * Initializes this resource bundle with a reference to the jarfile from which it was loaded diff --git a/src/java/com/threerings/miso/client/SceneObject.java b/src/java/com/threerings/miso/client/SceneObject.java index 07b9e4f7..48f4186f 100644 --- a/src/java/com/threerings/miso/client/SceneObject.java +++ b/src/java/com/threerings/miso/client/SceneObject.java @@ -365,7 +365,7 @@ public class SceneObject _spotTri.addPoint(-3, -3); _spotTri.addPoint(3, -3); _spotTri.addPoint(0, 3); - }; + } /** The alpha used to fill our bounds for warning purposes. */ protected static final Composite ALPHA_WARN = diff --git a/src/java/com/threerings/miso/client/TilePath.java b/src/java/com/threerings/miso/client/TilePath.java index d2f1e417..55db7e64 100644 --- a/src/java/com/threerings/miso/client/TilePath.java +++ b/src/java/com/threerings/miso/client/TilePath.java @@ -26,8 +26,6 @@ import java.util.List; import java.awt.Point; -import com.threerings.util.DirectionCodes; - import com.threerings.media.sprite.Sprite; import com.threerings.media.util.LineSegmentPath; import com.threerings.media.util.MathUtil; @@ -42,7 +40,6 @@ import com.threerings.miso.util.MisoUtil; * coordinates are updated as the path is traversed. */ public class TilePath extends LineSegmentPath - implements DirectionCodes { /** * Constructs a tile path. diff --git a/src/java/com/threerings/openal/OpenALSoundPlayer.java b/src/java/com/threerings/openal/OpenALSoundPlayer.java index 66e295f4..c695d3b5 100644 --- a/src/java/com/threerings/openal/OpenALSoundPlayer.java +++ b/src/java/com/threerings/openal/OpenALSoundPlayer.java @@ -408,7 +408,7 @@ public class OpenALSoundPlayer extends SoundPlayer protected MediaTimer _timer = FrameManager.createTimer(); protected long _lastTick; - }; + } /** * Loads a sound in its run method and calls subclasses with soundLoaded to let them know it's diff --git a/src/java/com/threerings/openal/Stream.java b/src/java/com/threerings/openal/Stream.java index 55c78eef..6d94e172 100644 --- a/src/java/com/threerings/openal/Stream.java +++ b/src/java/com/threerings/openal/Stream.java @@ -335,5 +335,5 @@ public abstract class Stream protected int _state = AL10.AL_INITIAL; /** Fading modes. */ - protected enum FadeMode { NONE, IN, OUT, OUT_DISPOSE }; + protected enum FadeMode { NONE, IN, OUT, OUT_DISPOSE } } diff --git a/src/java/com/threerings/util/BrowserUtil.java b/src/java/com/threerings/util/BrowserUtil.java index b5b939be..18d60cd8 100644 --- a/src/java/com/threerings/util/BrowserUtil.java +++ b/src/java/com/threerings/util/BrowserUtil.java @@ -142,5 +142,5 @@ public class BrowserUtil protected Process _process; protected URL _url; protected ResultListener _listener; - }; + } }