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

Various changes to support changes in the Narya library.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2276 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-02-12 07:24:08 +00:00
parent 5bca9e5397
commit a8a2d9b1ba
9 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/java/com/threerings/whirled/TestClient.java
+13 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: TestClient.java,v 1.14 2002/11/12 22:55:15 shaper Exp $
// $Id: TestClient.java,v 1.15 2003/02/12 07:24:08 mdb Exp $
package com.threerings.whirled;
@@ -11,11 +11,15 @@ import com.threerings.presents.net.*;
import com.threerings.crowd.Log;
import com.threerings.crowd.client.*;
import com.threerings.crowd.data.PlaceConfig;
import com.threerings.crowd.data.PlaceObject;
import com.threerings.whirled.client.SceneDirector;
import com.threerings.whirled.client.DefaultDisplaySceneFactory;
import com.threerings.whirled.client.persist.SceneRepository;
import com.threerings.whirled.data.Scene;
import com.threerings.whirled.data.SceneImpl;
import com.threerings.whirled.data.SceneModel;
import com.threerings.whirled.util.SceneFactory;
import com.threerings.whirled.util.WhirledContext;
public class TestClient
@@ -31,8 +35,13 @@ public class TestClient
_screp = new DummyClientSceneRepository();
_occdir = new OccupantDirector(_ctx);
_locdir = new LocationDirector(_ctx);
_scdir = new SceneDirector(
_ctx, _locdir, _screp, new DefaultDisplaySceneFactory());
SceneFactory sfact = new SceneFactory() {
public Scene createScene (SceneModel model, PlaceConfig config) {
return new SceneImpl(model, config);
}
};
_scdir = new SceneDirector(_ctx, _locdir, _screp, sfact);
// we want to know about logon/logoff
_client.addClientObserver(this);
tests/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java
+6 -6
View File
@@ -1,14 +1,14 @@
//
// $Id: SpotSceneParserTest.java,v 1.3 2002/02/09 07:50:04 mdb Exp $
// $Id: SpotSceneParserTest.java,v 1.4 2003/02/12 07:24:08 mdb Exp $
package com.threerings.whirled.tools.spot.xml;
package com.threerings.whirled.spot.tools.xml;
import com.samskivert.test.TestUtil;
import junit.framework.Test;
import junit.framework.TestCase;
import com.threerings.whirled.tools.spot.EditableSpotScene;
import com.threerings.whirled.spot.data.SpotScene;
public class SpotSceneParserTest extends TestCase
{
@@ -22,8 +22,8 @@ public class SpotSceneParserTest extends TestCase
try {
SpotSceneParser parser = new SpotSceneParser("scene");
String tspath = TestUtil.getResourcePath(TEST_SCENE_PATH);
EditableSpotScene scene = parser.parseScene(tspath);
// System.out.println("Parsed " + scene.getSpotSceneModel() + ".");
SpotScene scene = parser.parseScene(tspath);
System.out.println("Parsed " + scene + ".");
} catch (Exception e) {
e.printStackTrace();
@@ -43,5 +43,5 @@ public class SpotSceneParserTest extends TestCase
}
protected static final String TEST_SCENE_PATH =
"rsrc/whirled/tools/spot/xml/scene.xml";
"rsrc/whirled/spot/tools/xml/scene.xml";
}
tests/src/java/com/threerings/whirled/tools/xml/SceneParserTest.java
+4 -4
View File
@@ -1,5 +1,5 @@
//
// $Id: SceneParserTest.java,v 1.3 2002/02/09 07:50:04 mdb Exp $
// $Id: SceneParserTest.java,v 1.4 2003/02/12 07:24:08 mdb Exp $
package com.threerings.whirled.tools.xml;
@@ -8,7 +8,7 @@ import com.samskivert.test.TestUtil;
import junit.framework.Test;
import junit.framework.TestCase;
import com.threerings.whirled.tools.EditableScene;
import com.threerings.whirled.data.Scene;
public class SceneParserTest extends TestCase
{
@@ -22,8 +22,8 @@ public class SceneParserTest extends TestCase
try {
SceneParser parser = new SceneParser("scene");
String tspath = TestUtil.getResourcePath(TEST_SCENE_PATH);
EditableScene scene = parser.parseScene(tspath);
// System.out.println("Parsed " + scene.getSceneModel() + ".");
Scene scene = parser.parseScene(tspath);
System.out.println("Parsed " + scene + ".");
} catch (Exception e) {
e.printStackTrace();