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

Brought things back up to date; pruned imports; made Eclipse suggested

Browse Source 
cleanups.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2972 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:51:26 +00:00
parent d618d3c771
commit d4595269d5
22 changed files with 90 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/java/com/threerings/cast/CharSpriteViz.java
+3 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: CharSpriteViz.java,v 1.4 2003/02/12 07:24:07 mdb Exp $
// $Id: CharSpriteViz.java,v 1.5 2004/02/25 14:51:25 mdb Exp $
package com.threerings.cast;
@@ -103,7 +103,8 @@ public class CharSpriteViz extends JPanel
try {
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
ImageManager imgr = new ImageManager(rmgr, frame);
ComponentRepository crepo =
new BundledComponentRepository(rmgr, imgr, "components");
tests/src/java/com/threerings/cast/builder/TestApp.java
+3 -3
View File
@@ -1,5 +1,5 @@
//
// $Id: TestApp.java,v 1.16 2003/01/13 22:57:45 mdb Exp $
// $Id: TestApp.java,v 1.17 2004/02/25 14:51:25 mdb Exp $
package com.threerings.cast.builder;
@@ -11,7 +11,6 @@ import com.samskivert.swing.util.SwingUtil;
import com.threerings.media.image.ImageManager;
import com.threerings.resource.ResourceManager;
import com.threerings.cast.Log;
import com.threerings.cast.CharacterManager;
import com.threerings.cast.ComponentRepository;
import com.threerings.cast.bundle.BundledComponentRepository;
@@ -26,7 +25,8 @@ public class TestApp
SwingUtil.centerWindow(_frame);
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
ImageManager imgr = new ImageManager(rmgr, _frame);
ComponentRepository crepo =
tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
+3 -3
View File
@@ -1,10 +1,9 @@
//
// $Id: BundledComponentRepositoryTest.java,v 1.8 2003/01/13 22:57:45 mdb Exp $
// $Id: BundledComponentRepositoryTest.java,v 1.9 2004/02/25 14:51:25 mdb Exp $
package com.threerings.cast.bundle;
import java.util.Iterator;
import com.samskivert.util.StringUtil;
import com.threerings.cast.ComponentClass;
import com.threerings.media.image.ImageManager;
@@ -24,7 +23,8 @@ public class BundledComponentRepositoryTest extends TestCase
{
try {
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
ImageManager imgr = new ImageManager(rmgr, null);
BundledComponentRepository repo =
new BundledComponentRepository(rmgr, imgr, "components");
tests/src/java/com/threerings/crowd/client/TestClient.java
+7 -1
View File
@@ -1,8 +1,9 @@
//
// $Id: TestClient.java,v 1.12 2002/11/12 22:55:15 shaper Exp $
// $Id: TestClient.java,v 1.13 2004/02/25 14:51:25 mdb Exp $
package com.threerings.crowd.client;
import com.samskivert.util.Config;
import com.samskivert.util.Queue;
import com.threerings.presents.client.*;
@@ -99,6 +100,11 @@ public class TestClient
protected class CrowdContextImpl implements CrowdContext
{
public Config getConfig ()
{
return null;
}
public Client getClient ()
{
return _client;
tests/src/java/com/threerings/media/ImageLoadingSpeed.java
+1 -5
View File
@@ -1,18 +1,14 @@
//
// $Id: ImageLoadingSpeed.java,v 1.4 2003/04/27 06:38:48 mdb Exp $
// $Id: ImageLoadingSpeed.java,v 1.5 2004/02/25 14:51:25 mdb Exp $
package com.threerings.media;
import java.awt.Image;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
import javax.imageio.stream.FileImageInputStream;
import java.io.*;
import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageManager;
import com.threerings.resource.ResourceManager;
/**
* Tests our image loading speed.
tests/src/java/com/threerings/media/sound/SoundTestApp.java
+1 -2
View File
@@ -1,9 +1,8 @@
//
// $Id: SoundTestApp.java,v 1.5 2003/04/17 19:21:17 mdb Exp $
// $Id: SoundTestApp.java,v 1.6 2004/02/25 14:51:25 mdb Exp $
package com.threerings.media.sound;
import com.samskivert.util.StringUtil;
import com.threerings.resource.ResourceManager;
import com.threerings.media.Log;
tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
+3 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: BundledTileSetRepositoryTest.java,v 1.8 2003/01/13 22:57:45 mdb Exp $
// $Id: BundledTileSetRepositoryTest.java,v 1.9 2004/02/25 14:51:26 mdb Exp $
package com.threerings.media.tile.bundle;
@@ -22,7 +22,8 @@ public class BundledTileSetRepositoryTest extends TestCase
{
try {
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
BundledTileSetRepository repo = new BundledTileSetRepository(
rmgr, new ImageManager(rmgr, null), "tilesets");
Iterator sets = repo.enumerateTileSets();
tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
+1 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: BuildTestTileSetBundle.java,v 1.6 2002/04/06 02:03:32 mdb Exp $
// $Id: BuildTestTileSetBundle.java,v 1.7 2004/02/25 14:51:26 mdb Exp $
package com.threerings.media.tile.bundle.tools;
@@ -7,9 +7,6 @@ import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import junit.framework.Test;
import junit.framework.TestCase;
import com.samskivert.io.PersistenceException;
import com.samskivert.test.TestUtil;
tests/src/java/com/threerings/media/util/PathViz.java
+1 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: PathViz.java,v 1.3 2003/04/26 17:56:26 mdb Exp $
// $Id: PathViz.java,v 1.4 2004/02/25 14:51:26 mdb Exp $
package com.threerings.media.util;
@@ -15,7 +15,6 @@ import com.threerings.media.ManagedJFrame;
import com.threerings.media.MediaPanel;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.util.*;
/**
* A test app that is useful for visualizing paths during their
tests/src/java/com/threerings/media/util/TraceViz.java
+1 -3
View File
@@ -1,12 +1,10 @@
//
// $Id: TraceViz.java,v 1.4 2003/01/24 22:54:48 mdb Exp $
// $Id: TraceViz.java,v 1.5 2004/02/25 14:51:26 mdb Exp $
package com.threerings.media.util;
import java.awt.Color;
import java.awt.Graphics;
import java.awt.Image;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.io.File;
tests/src/java/com/threerings/miso/client/ScrollingFrame.java
+1 -2
View File
@@ -1,9 +1,8 @@
//
// $Id: ScrollingFrame.java,v 1.4 2003/01/31 23:11:07 mdb Exp $
// $Id: ScrollingFrame.java,v 1.5 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.client;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.GraphicsConfiguration;
tests/src/java/com/threerings/miso/client/ScrollingScene.java
+1 -4
View File
@@ -1,11 +1,10 @@
//
// $Id: ScrollingScene.java,v 1.13 2003/04/17 19:21:17 mdb Exp $
// $Id: ScrollingScene.java,v 1.14 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.client;
import java.awt.Rectangle;
import java.util.Collections;
import java.util.Iterator;
import java.util.Random;
@@ -13,8 +12,6 @@ import com.samskivert.io.PersistenceException;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.NoSuchTileSetException;
import com.threerings.media.tile.ObjectTile;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TileSetRepository;
tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
+14 -21
View File
@@ -1,5 +1,5 @@
//
// $Id: ScrollingTestApp.java,v 1.23 2003/04/26 17:56:26 mdb Exp $
// $Id: ScrollingTestApp.java,v 1.24 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.client;
@@ -7,11 +7,8 @@ import java.awt.DisplayMode;
import java.awt.GraphicsConfiguration;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.Point;
import java.io.IOException;
import java.util.Iterator;
import com.samskivert.swing.util.SwingUtil;
import com.samskivert.util.Config;
@@ -21,13 +18,10 @@ import com.threerings.resource.ResourceManager;
import com.threerings.media.FrameManager;
import com.threerings.media.image.ImageManager;
import com.threerings.media.util.LinePath;
import com.threerings.media.util.MultiFrameImage;
import com.threerings.media.util.MultiFrameImageImpl;
import com.threerings.media.util.Path;
import com.threerings.media.sprite.PathCompletedEvent;
import com.threerings.media.sprite.PathAdapter;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteEvent;
import com.threerings.media.sprite.SpriteObserver;
import com.threerings.media.tile.bundle.BundledTileSetRepository;
@@ -80,7 +74,8 @@ public class ScrollingTestApp
// we don't need to configure anything
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
ImageManager imgr = new ImageManager(rmgr, _frame);
_tilemgr = new MisoTileManager(rmgr, imgr);
_tilemgr.setTileSetRepository(
@@ -123,16 +118,14 @@ public class ScrollingTestApp
", name=" + scname + "].");
}
_ship.addSpriteObserver(new SpriteObserver() {
public void handleEvent (SpriteEvent event) {
if (event instanceof PathCompletedEvent) {
// keep scrolling for a spell
if (++_sidx < DX.length) {
int x = _ship.getX(), y = _ship.getY();
LinePath path = new LinePath(
x, y, x + DX[_sidx], y + DY[_sidx], 30000l);
_ship.move(path);
}
_ship.addSpriteObserver(new PathAdapter() {
public void pathCompleted (Sprite sprite, Path path, long when) {
// keep scrolling for a spell
if (++_sidx < DX.length) {
int x = _ship.getX(), y = _ship.getY();
LinePath lpath = new LinePath(
x, y, x + DX[_sidx], y + DY[_sidx], 30000l);
_ship.move(lpath);
}
}
protected int _sidx = -1;
@@ -141,7 +134,7 @@ public class ScrollingTestApp
});
// make the panel follow the ship around
_panel.setFollowsPathable(_ship);
_panel.setFollowsPathable(_ship, MisoScenePanel.CENTER_ON_PATHABLE);
int x = _ship.getX(), y = _ship.getY();
_ship.move(new LinePath(x, y, x, y + 1000, 3000l));
tests/src/java/com/threerings/miso/viewer/ViewerApp.java
+3 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: ViewerApp.java,v 1.39 2003/04/26 17:56:26 mdb Exp $
// $Id: ViewerApp.java,v 1.40 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.viewer;
@@ -67,7 +67,8 @@ public class ViewerApp
// we don't need to configure anything
ResourceManager rmgr = new ResourceManager("rsrc");
rmgr.initBundles(null, "config/resource/manager.properties", null);
rmgr.initBundles(
null, "config/resource/manager.properties", null, null);
ImageManager imgr = new ImageManager(rmgr, _frame);
_tilemgr = new MisoTileManager(rmgr, imgr);
_tilemgr.setTileSetRepository(
tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
+18 -18
View File
@@ -1,16 +1,13 @@
//
// $Id: ViewerSceneViewPanel.java,v 1.58 2003/04/25 15:52:25 mdb Exp $
// $Id: ViewerSceneViewPanel.java,v 1.59 2004/02/25 14:51:26 mdb Exp $
package com.threerings.miso.viewer;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import com.threerings.util.RandomUtil;
import com.threerings.media.FrameManager;
import com.threerings.cast.CharacterDescriptor;
import com.threerings.cast.CharacterManager;
@@ -18,12 +15,12 @@ import com.threerings.cast.CharacterSprite;
import com.threerings.cast.ComponentRepository;
import com.threerings.cast.util.CastUtil;
import com.threerings.media.sprite.PathCompletedEvent;
import com.threerings.media.sprite.SpriteEvent;
import com.threerings.media.sprite.PathObserver;
import com.threerings.media.sprite.Sprite;
import com.threerings.media.sprite.SpriteManager;
import com.threerings.media.sprite.SpriteObserver;
import com.threerings.media.util.LineSegmentPath;
import com.threerings.media.util.Path;
import com.threerings.media.util.PerformanceMonitor;
import com.threerings.media.util.PerformanceObserver;
@@ -34,7 +31,7 @@ import com.threerings.miso.data.MisoSceneModel;
import com.threerings.miso.util.MisoContext;
public class ViewerSceneViewPanel extends MisoScenePanel
implements PerformanceObserver, SpriteObserver
implements PerformanceObserver, PathObserver
{
/**
* Construct the panel and initialize it with a context.
@@ -51,7 +48,7 @@ public class ViewerSceneViewPanel extends MisoScenePanel
// create the manipulable sprite
_sprite = createSprite(_spritemgr, charmgr, _descUser);
setFollowsPathable(_sprite);
setFollowsPathable(_sprite, CENTER_ON_PATHABLE);
// create the decoy sprites
createDecoys(_spritemgr, charmgr);
@@ -155,7 +152,7 @@ public class ViewerSceneViewPanel extends MisoScenePanel
protected boolean createPath (CharacterSprite s, int x, int y)
{
// get the path from here to there
LineSegmentPath path = (LineSegmentPath)getPath(s, x, y);
LineSegmentPath path = (LineSegmentPath)getPath(s, x, y, true);
if (path == null) {
s.cancelMove();
return false;
@@ -181,18 +178,21 @@ public class ViewerSceneViewPanel extends MisoScenePanel
}
// documentation inherited
public void handleEvent (SpriteEvent event)
public void pathCompleted (Sprite sprite, Path path, long when)
{
if (event instanceof PathCompletedEvent) {
CharacterSprite s = (CharacterSprite)event.getSprite();
if (s != _sprite) {
// move the sprite to a new random location
createRandomPath(s);
}
CharacterSprite s = (CharacterSprite)sprite;
if (s != _sprite) {
// move the sprite to a new random location
createRandomPath(s);
}
}
// documentation inherited
public void pathCancelled (Sprite sprite, Path path)
{
// nothing doing
}
/** The number of decoy characters milling about. */
protected static final int NUM_DECOYS = 5;
tests/src/java/com/threerings/parlor/TestClient.java
+7 -1
View File
@@ -1,8 +1,9 @@
//
// $Id: TestClient.java,v 1.11 2002/11/12 22:55:15 shaper Exp $
// $Id: TestClient.java,v 1.12 2004/02/25 14:51:26 mdb Exp $
package com.threerings.parlor;
import com.samskivert.util.Config;
import com.samskivert.util.Queue;
import com.threerings.presents.client.*;
@@ -147,6 +148,11 @@ public class TestClient
protected class ParlorContextImpl implements ParlorContext
{
public Config getConfig ()
{
return null;
}
public Client getClient ()
{
return _client;
tests/src/java/com/threerings/presents/server/DOMTest.java
+3 -6
View File
@@ -1,14 +1,11 @@
//
// $Id: DOMTest.java,v 1.9 2002/04/15 16:34:36 shaper Exp $
// $Id: DOMTest.java,v 1.10 2004/02/25 14:51:26 mdb Exp $
package com.threerings.presents.server;
import junit.framework.Test;
import junit.framework.TestCase;
import com.samskivert.util.StringUtil;
import com.threerings.presents.Log;
import com.threerings.presents.dobj.*;
/**
@@ -52,7 +49,7 @@ public class DOMTest extends TestCase
public void requestFailed (int oid, ObjectAccessException cause)
{
fail("Request failed: " + cause);
_omgr.shutdown();
_omgr.harshShutdown();
}
public void attributeChanged (AttributeChangedEvent event)
@@ -63,7 +60,7 @@ public class DOMTest extends TestCase
// shutdown once we receive our last update
if (++_fcount == fields.length) {
_omgr.shutdown();
_omgr.harshShutdown();
}
}
tests/src/java/com/threerings/presents/server/DestroyedRefTest.java
+2 -2
View File
@@ -1,5 +1,5 @@
//
// $Id: DestroyedRefTest.java,v 1.8 2002/04/15 16:34:36 shaper Exp $
// $Id: DestroyedRefTest.java,v 1.9 2004/02/25 14:51:26 mdb Exp $
package com.threerings.presents.server;
@@ -71,7 +71,7 @@ public class DestroyedRefTest
} else if (event instanceof AttributeChangedEvent) {
// go bye bye
_omgr.shutdown();
_omgr.harshShutdown();
} else {
fail("Got unexpected event: " + event);
tests/src/java/com/threerings/presents/server/RefTest.java
+2 -3
View File
@@ -1,12 +1,11 @@
//
// $Id: RefTest.java,v 1.8 2002/04/15 16:34:36 shaper Exp $
// $Id: RefTest.java,v 1.9 2004/02/25 14:51:26 mdb Exp $
package com.threerings.presents.server;
import junit.framework.Test;
import junit.framework.TestCase;
import com.threerings.presents.Log;
import com.threerings.presents.dobj.*;
/**
@@ -63,7 +62,7 @@ public class RefTest
} else {
// Log.info("Other object destroyed.");
// go bye bye
_omgr.shutdown();
_omgr.harshShutdown();
}
} else if (event instanceof ObjectRemovedEvent) {
tests/src/java/com/threerings/presents/server/TestObject.java
+7 -7
View File
@@ -1,5 +1,5 @@
//
// $Id: TestObject.java,v 1.3 2002/03/19 01:10:03 mdb Exp $
// $Id: TestObject.java,v 1.4 2004/02/25 14:51:26 mdb Exp $
package com.threerings.presents.server;
@@ -41,8 +41,8 @@ public class TestObject extends DObject
*/
public void setFoo (int foo)
{
this.foo = foo;
requestAttributeChange(FOO, new Integer(foo));
this.foo = foo;
}
/**
@@ -55,8 +55,8 @@ public class TestObject extends DObject
*/
public void setBar (String bar)
{
this.bar = bar;
requestAttributeChange(BAR, bar);
this.bar = bar;
}
/**
@@ -69,8 +69,8 @@ public class TestObject extends DObject
*/
public void setInts (int[] ints)
{
this.ints = ints;
requestAttributeChange(INTS, ints);
this.ints = ints;
}
/**
@@ -83,8 +83,8 @@ public class TestObject extends DObject
*/
public void setIntsAt (int value, int index)
{
this.ints[index] = value;
requestElementUpdate(INTS, new Integer(value), index);
this.ints[index] = value;
}
/**
@@ -97,8 +97,8 @@ public class TestObject extends DObject
*/
public void setStrings (String[] strings)
{
this.strings = strings;
requestAttributeChange(STRINGS, strings);
this.strings = strings;
}
/**
@@ -111,8 +111,8 @@ public class TestObject extends DObject
*/
public void setStringsAt (String value, int index)
{
this.strings[index] = value;
requestElementUpdate(STRINGS, value, index);
this.strings[index] = value;
}
/**
tests/src/java/com/threerings/util/KeyboardManagerApp.java
+1 -2
View File
@@ -1,11 +1,10 @@
//
// $Id: KeyboardManagerApp.java,v 1.4 2002/11/12 22:55:32 shaper Exp $
// $Id: KeyboardManagerApp.java,v 1.5 2004/02/25 14:51:26 mdb Exp $
package com.threerings.util;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import javax.swing.JFrame;
import javax.swing.JPanel;
tests/src/java/com/threerings/whirled/TestClient.java
+7 -1
View File
@@ -1,8 +1,9 @@
//
// $Id: TestClient.java,v 1.15 2003/02/12 07:24:08 mdb Exp $
// $Id: TestClient.java,v 1.16 2004/02/25 14:51:26 mdb Exp $
package com.threerings.whirled;
import com.samskivert.util.Config;
import com.samskivert.util.Queue;
import com.threerings.presents.client.*;
@@ -138,6 +139,11 @@ public class TestClient
protected class WhirledContextImpl implements WhirledContext
{
public Config getConfig ()
{
return null;
}
public Client getClient ()
{
return _client;