AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eclipse suggested cleanup.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2971 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:50:28 +00:00
parent 6cd4e73720
commit d618d3c771
169 changed files with 208 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/puzzle/client/PlayerStatusView.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: PlayerStatusView.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: PlayerStatusView.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
@@ -7,7 +7,6 @@ import javax.swing.JPanel;
import com.threerings.parlor.game.GameObject;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.BoardSummary;
import com.threerings.puzzle.data.PuzzleConfig;
import com.threerings.puzzle.data.PuzzleObject;
src/java/com/threerings/puzzle/client/PuzzleAnimationWaiter.java
+1 -2
View File
@@ -1,11 +1,10 @@
//
// $Id: PuzzleAnimationWaiter.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: PuzzleAnimationWaiter.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
import com.threerings.media.animation.AnimationWaiter;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.PuzzleObject;
/**
src/java/com/threerings/puzzle/client/PuzzleBoardView.java
+1 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: PuzzleBoardView.java,v 1.6 2003/12/10 03:32:07 mdb Exp $
// $Id: PuzzleBoardView.java,v 1.7 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
@@ -7,9 +7,7 @@ import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
import java.util.ArrayList;
@@ -24,7 +22,6 @@ import com.threerings.media.animation.Animation;
import com.threerings.media.animation.AnimationAdapter;
import com.threerings.media.image.Mirage;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.Board;
src/java/com/threerings/puzzle/client/PuzzleController.java
+3 -20
View File
@@ -1,5 +1,5 @@
//
// $Id: PuzzleController.java,v 1.3 2003/12/05 02:39:12 mdb Exp $
// $Id: PuzzleController.java,v 1.4 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
@@ -12,42 +12,25 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import javax.swing.JButton;
import com.samskivert.swing.GroupLayout;
import com.samskivert.swing.event.CommandEvent;
import com.samskivert.util.CollectionUtil;
import com.samskivert.util.ObserverList;
import com.samskivert.util.StringUtil;
import com.threerings.io.Streamable;
import com.threerings.util.MessageBundle;
import com.threerings.util.StreamableArrayList;
import com.threerings.media.FrameParticipant;
import com.threerings.media.sound.SoundCodes;
import com.threerings.presents.client.InvocationReceiver;
import com.threerings.presents.dobj.AttributeChangeListener;
import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.ElementUpdateListener;
import com.threerings.presents.dobj.ElementUpdatedEvent;
import com.threerings.crowd.client.OccupantDirector;
import com.threerings.crowd.client.PlaceControllerDelegate;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.parlor.game.GameController;
import com.threerings.parlor.game.GameObject;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.Board;
import com.threerings.puzzle.data.BoardSummary;
import com.threerings.puzzle.data.PuzzleCodes;
import com.threerings.puzzle.data.PuzzleConfig;
import com.threerings.puzzle.data.PuzzleObject;
@@ -547,7 +530,7 @@ public abstract class PuzzleController extends GameController
canClear[0] = (_pview.getActionCount() == 0);
if (!canClear[0]) {
_pview.dumpActors();
_pview.DEBUG_ACTION = true;
PuzzleBoardView.DEBUG_ACTION = true;
}
// let our delegates do their business
@@ -587,7 +570,7 @@ public abstract class PuzzleController extends GameController
// make a note that we've cleared the action
_astate = ACTION_CLEARED;
_pview.DEBUG_ACTION = false;
PuzzleBoardView.DEBUG_ACTION = false;
// let our delegates do their business
applyToDelegates(PuzzleControllerDelegate.class, new DelegateOp() {
src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: PuzzleControllerDelegate.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: PuzzleControllerDelegate.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
@@ -8,7 +8,6 @@ import com.threerings.crowd.data.PlaceObject;
import com.threerings.parlor.game.GameControllerDelegate;
import com.threerings.puzzle.data.Board;
import com.threerings.puzzle.data.BoardSummary;
import com.threerings.puzzle.data.PuzzleCodes;
import com.threerings.puzzle.data.PuzzleGameCodes;
import com.threerings.puzzle.data.PuzzleObject;
src/java/com/threerings/puzzle/client/PuzzlePanel.java
+1 -6
View File
@@ -1,18 +1,15 @@
//
// $Id: PuzzlePanel.java,v 1.2 2003/11/26 17:46:06 mdb Exp $
// $Id: PuzzlePanel.java,v 1.3 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
import java.awt.BorderLayout;
import java.awt.Graphics;
import java.io.IOException;
import javax.swing.JPanel;
import com.samskivert.swing.Controller;
import com.samskivert.swing.ControllerProvider;
import com.samskivert.swing.util.SwingUtil;
import com.threerings.media.image.Mirage;
import com.threerings.util.KeyTranslator;
import com.threerings.util.RobotPlayer;
@@ -20,11 +17,9 @@ import com.threerings.crowd.client.PlaceView;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.BoardSummary;
import com.threerings.puzzle.data.PuzzleCodes;
import com.threerings.puzzle.data.PuzzleConfig;
import com.threerings.puzzle.data.PuzzleGameCodes;
import com.threerings.puzzle.data.PuzzleObject;
import com.threerings.puzzle.util.PuzzleContext;
/**
src/java/com/threerings/puzzle/client/ScoreAnimation.java
+1 -5
View File
@@ -1,12 +1,10 @@
//
// $Id: ScoreAnimation.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: ScoreAnimation.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.client;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Rectangle;
@@ -14,8 +12,6 @@ import com.samskivert.swing.Label;
import com.threerings.media.animation.Animation;
import com.threerings.puzzle.Log;
public class ScoreAnimation extends Animation
{
/**
src/java/com/threerings/puzzle/data/PuzzlerObject.java
+1 -3
View File
@@ -1,10 +1,8 @@
//
// $Id: PuzzlerObject.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: PuzzlerObject.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.data;
import com.threerings.crowd.data.BodyObject;
/**
* An interface that must be implemented by {@link BodyObject} derivations
* that wish to be usable with the puzzle services.
src/java/com/threerings/puzzle/drop/client/DropBlockSprite.java
+1 -3
View File
@@ -1,12 +1,10 @@
//
// $Id: DropBlockSprite.java,v 1.2 2003/12/31 01:26:23 ray Exp $
// $Id: DropBlockSprite.java,v 1.3 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.client;
import java.awt.Rectangle;
import com.threerings.puzzle.Log;
/**
* The drop block sprite represents a block of multiple pieces that can be
* rotated to any of the four cardinal compass directions. As such, it
src/java/com/threerings/puzzle/drop/client/DropBoardView.java
+1 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: DropBoardView.java,v 1.2 2003/11/26 02:07:45 mdb Exp $
// $Id: DropBoardView.java,v 1.3 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.client;
@@ -8,16 +8,12 @@ import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
import java.util.Iterator;
import com.samskivert.swing.Label;
import com.threerings.media.image.Mirage;
import com.threerings.media.sprite.Sprite;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.client.PuzzleBoardView;
import com.threerings.puzzle.client.ScoreAnimation;
import com.threerings.puzzle.data.Board;
src/java/com/threerings/puzzle/drop/client/DropControllerDelegate.java
+1 -5
View File
@@ -1,5 +1,5 @@
//
// $Id: DropControllerDelegate.java,v 1.2 2003/12/31 01:26:23 ray Exp $
// $Id: DropControllerDelegate.java,v 1.3 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.client;
@@ -11,13 +11,10 @@ import java.awt.event.ActionEvent;
import java.util.List;
import com.samskivert.util.IntListUtil;
import com.samskivert.util.StringUtil;
import com.threerings.util.DirectionUtil;
import com.threerings.media.FrameParticipant;
import com.threerings.media.animation.Animation;
import com.threerings.media.animation.AnimationAdapter;
import com.threerings.media.sprite.Sprite;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.util.CrowdContext;
@@ -36,7 +33,6 @@ import com.threerings.puzzle.drop.data.DropCodes;
import com.threerings.puzzle.drop.data.DropConfig;
import com.threerings.puzzle.drop.data.DropLogic;
import com.threerings.puzzle.drop.data.DropPieceCodes;
import com.threerings.puzzle.drop.util.DropBoardUtil;
import com.threerings.puzzle.drop.util.DropPieceProvider;
import com.threerings.puzzle.drop.util.PieceDropLogic;
import com.threerings.puzzle.drop.util.PieceDropper.PieceDropInfo;
src/java/com/threerings/puzzle/drop/client/DropSprite.java
+1 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: DropSprite.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: DropSprite.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.client;
@@ -13,9 +13,6 @@ import com.threerings.util.DirectionUtil;
import com.threerings.media.image.Mirage;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.tile.TileManager;
import com.threerings.puzzle.Log;
/**
* The drop sprite is a sprite that displays one or more pieces falling
src/java/com/threerings/puzzle/drop/client/NextBlockView.java
+1 -4
View File
@@ -1,16 +1,13 @@
//
// $Id: NextBlockView.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: NextBlockView.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.client;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.swing.JComponent;
import javax.swing.border.Border;
import com.threerings.media.image.Mirage;
import com.threerings.util.DirectionCodes;
src/java/com/threerings/puzzle/drop/data/DropBoard.java
+1 -5
View File
@@ -1,21 +1,17 @@
//
// $Id: DropBoard.java,v 1.3 2003/12/31 01:26:23 ray Exp $
// $Id: DropBoard.java,v 1.4 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.data;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.Arrays;
import org.apache.commons.lang.Strings;
import com.threerings.util.DirectionCodes;
import com.threerings.util.DirectionUtil;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.Board;
import com.threerings.puzzle.drop.client.DropControllerDelegate;
import com.threerings.puzzle.drop.data.DropPieceCodes;
import com.threerings.puzzle.drop.util.DropBoardUtil;
src/java/com/threerings/puzzle/drop/data/SegmentInfo.java
+1 -3
View File
@@ -1,12 +1,10 @@
//
// $Id: SegmentInfo.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: SegmentInfo.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.data;
import com.samskivert.util.StringUtil;
import com.threerings.util.DirectionCodes;
/**
* Describes a segment of pieces in a {@link DropBoard}.
*/
src/java/com/threerings/puzzle/drop/server/DropManagerDelegate.java
+1 -11
View File
@@ -1,31 +1,21 @@
//
// $Id: DropManagerDelegate.java,v 1.2 2003/11/26 03:17:16 mdb Exp $
// $Id: DropManagerDelegate.java,v 1.3 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.server;
import java.util.List;
import com.threerings.util.MessageBundle;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.parlor.game.GameManager;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.Board;
import com.threerings.puzzle.data.BoardSummary;
import com.threerings.puzzle.data.PuzzleCodes;
import com.threerings.puzzle.data.PuzzleObject;
import com.threerings.puzzle.server.PuzzleManager;
import com.threerings.puzzle.server.PuzzleManagerDelegate;
import com.threerings.puzzle.drop.data.DropBoard;
import com.threerings.puzzle.drop.data.DropBoardSummary;
import com.threerings.puzzle.drop.data.DropCodes;
import com.threerings.puzzle.drop.data.DropConfig;
import com.threerings.puzzle.drop.data.DropLogic;
import com.threerings.puzzle.drop.util.DropPieceProvider;
import com.threerings.puzzle.drop.util.PieceDropLogic;
import com.threerings.puzzle.drop.util.PieceDropper;
src/java/com/threerings/puzzle/drop/util/DropBoardUtil.java
+1 -3
View File
@@ -1,12 +1,10 @@
//
// $Id: DropBoardUtil.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: DropBoardUtil.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.util;
import com.threerings.util.DirectionCodes;
import com.threerings.puzzle.drop.data.DropBoard;
public class DropBoardUtil
implements DirectionCodes
{
src/java/com/threerings/puzzle/drop/util/PieceDropLogic.java
+1 -2
View File
@@ -1,9 +1,8 @@
//
// $Id: PieceDropLogic.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: PieceDropLogic.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.drop.util;
import com.threerings.util.DirectionCodes;
import com.threerings.puzzle.drop.data.DropBoard;
/**
src/java/com/threerings/puzzle/server/PuzzleManager.java
+1 -11
View File
@@ -1,38 +1,28 @@
//
// $Id: PuzzleManager.java,v 1.6 2004/01/30 23:03:22 ray Exp $
// $Id: PuzzleManager.java,v 1.7 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.server;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import com.samskivert.util.IntListUtil;
import com.samskivert.util.IntTuple;
import com.samskivert.util.IntervalManager;
import com.samskivert.util.ResultListener;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Tuple;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.DObject;
import com.threerings.presents.dobj.DSet;
import com.threerings.presents.dobj.OidList;
import com.threerings.presents.server.util.SafeInterval;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.server.CrowdServer;
import com.threerings.crowd.server.PlaceManagerDelegate;
import com.threerings.parlor.game.GameManager;
import com.threerings.parlor.game.GameObject;
import com.threerings.parlor.game.PartyGameConfig;
import com.threerings.util.MessageBundle;
import com.threerings.util.RandomUtil;
import com.threerings.util.StreamableArrayList;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.data.Board;
src/java/com/threerings/puzzle/server/PuzzleProvider.java
+1 -6
View File
@@ -1,10 +1,8 @@
//
// $Id: PuzzleProvider.java,v 1.1 2003/11/26 01:42:34 mdb Exp $
// $Id: PuzzleProvider.java,v 1.2 2004/02/25 14:48:44 mdb Exp $
package com.threerings.puzzle.server;
import com.samskivert.util.StringUtil;
import com.threerings.presents.client.InvocationService.InvocationListener;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.dobj.RootDObjectManager;
@@ -12,7 +10,6 @@ import com.threerings.presents.server.InvocationException;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.crowd.data.BodyObject;
import com.threerings.crowd.data.OccupantInfo;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.crowd.server.PlaceManager;
@@ -22,8 +19,6 @@ import com.threerings.parlor.game.GameManager;
import com.threerings.puzzle.Log;
import com.threerings.puzzle.client.PuzzleService.EnterPuzzleListener;
import com.threerings.puzzle.data.Board;
import com.threerings.puzzle.data.BoardSummary;
import com.threerings.puzzle.data.PuzzleCodes;
import com.threerings.puzzle.data.PuzzleObject;
import com.threerings.puzzle.data.PuzzlerObject;