diff --git a/tests/build.xml b/tests/build.xml index 854c9411..1b4c2f59 100644 --- a/tests/build.xml +++ b/tests/build.xml @@ -94,6 +94,8 @@ + + diff --git a/tests/src/java/com/threerings/cast/CharSpriteViz.java b/tests/src/java/com/threerings/cast/CharSpriteViz.java index a560ef54..a8002b76 100644 --- a/tests/src/java/com/threerings/cast/CharSpriteViz.java +++ b/tests/src/java/com/threerings/cast/CharSpriteViz.java @@ -134,7 +134,7 @@ public class CharSpriteViz extends JPanel BorderLayout.CENTER); frame.setSize(200, 200); SwingUtil.centerWindow(frame); - frame.show(); + frame.setVisible(true); } catch (NoSuchComponentException nsce) { System.err.println("No component with specified class " + diff --git a/tests/src/java/com/threerings/cast/builder/TestApp.java b/tests/src/java/com/threerings/cast/builder/TestApp.java index bfaa5c10..8e739ffe 100644 --- a/tests/src/java/com/threerings/cast/builder/TestApp.java +++ b/tests/src/java/com/threerings/cast/builder/TestApp.java @@ -58,7 +58,7 @@ public class TestApp public void run () { _frame.pack(); - _frame.show(); + _frame.setVisible(true); } public static void main (String[] args) diff --git a/tests/src/java/com/threerings/geom/NearestViz.java b/tests/src/java/com/threerings/geom/NearestViz.java index 51c58c8b..295b633c 100644 --- a/tests/src/java/com/threerings/geom/NearestViz.java +++ b/tests/src/java/com/threerings/geom/NearestViz.java @@ -92,7 +92,7 @@ public class NearestViz extends JPanel frame.getContentPane().add(new NearestViz(), BorderLayout.CENTER); frame.setSize(300, 300); SwingUtil.centerWindow(frame); - frame.show(); + frame.setVisible(true); } protected float _theta = (float)(3 * Math.PI / 5); diff --git a/tests/src/java/com/threerings/geom/WhichSideViz.java b/tests/src/java/com/threerings/geom/WhichSideViz.java index 6914b9e8..d46e7409 100644 --- a/tests/src/java/com/threerings/geom/WhichSideViz.java +++ b/tests/src/java/com/threerings/geom/WhichSideViz.java @@ -104,7 +104,7 @@ public class WhichSideViz extends JPanel frame.getContentPane().add(new WhichSideViz(), BorderLayout.CENTER); frame.setSize(300, 300); SwingUtil.centerWindow(frame); - frame.show(); + frame.setVisible(true); } protected float _theta = (float)(3 * Math.PI / 5); diff --git a/tests/src/java/com/threerings/media/TestIconManager.java b/tests/src/java/com/threerings/media/TestIconManager.java index 3aa73bce..6ee1d0c4 100644 --- a/tests/src/java/com/threerings/media/TestIconManager.java +++ b/tests/src/java/com/threerings/media/TestIconManager.java @@ -56,7 +56,7 @@ public class TestIconManager frame.getContentPane().add(panel, BorderLayout.CENTER); frame.pack(); SwingUtil.centerWindow(frame); - frame.show(); + frame.setVisible(true); } catch (Exception e) { e.printStackTrace(System.err); diff --git a/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java b/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java index da1f285a..7d98a80b 100644 --- a/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java +++ b/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java @@ -52,17 +52,15 @@ public class BuildTestTileSetBundle } } - /** Dummy tileset id broker that makes up tileset ids (which are - * consistent in the course of execution of the application, but not - * between invocations). */ - protected static class DummyTileSetIDBroker - extends HashMap + /** Dummy tileset id broker that makes up tileset ids (which are consistent in the course of + * execution of the application, but not between invocations). */ + protected static class DummyTileSetIDBroker extends HashMap implements TileSetIDBroker { public int getTileSetID (String tileSetName) throws PersistenceException { - Integer id = (Integer)get(tileSetName); + Integer id = get(tileSetName); if (id == null) { id = new Integer(++_nextId); put(tileSetName, id); @@ -83,12 +81,7 @@ public class BuildTestTileSetBundle protected int _nextId; } - protected static final String CONFIG_PATH = - "rsrc/media/tile/bundle/tools/bundler-config.xml"; - - protected static final String BUNDLE_DESC_PATH = - "rsrc/media/tile/bundle/tools/bundle.xml"; - - protected static final String TARGET_PATH = - "rsrc/media/tile/bundle/tools/bundle.jar"; + protected static final String CONFIG_PATH = "rsrc/media/tile/bundle/tools/bundler-config.xml"; + protected static final String BUNDLE_DESC_PATH = "rsrc/media/tile/bundle/tools/bundle.xml"; + protected static final String TARGET_PATH = "rsrc/media/tile/bundle/tools/bundle.jar"; } diff --git a/tests/src/java/com/threerings/media/util/TraceViz.java b/tests/src/java/com/threerings/media/util/TraceViz.java index 43ac47d9..7fd7ca75 100644 --- a/tests/src/java/com/threerings/media/util/TraceViz.java +++ b/tests/src/java/com/threerings/media/util/TraceViz.java @@ -89,7 +89,7 @@ public class TraceViz { _frame.pack(); SwingUtil.centerWindow(_frame); - _frame.show(); + _frame.setVisible(true); } public static void main (String[] args) diff --git a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java index e91c5067..89df5412 100644 --- a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java +++ b/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java @@ -199,7 +199,7 @@ public class ScrollingTestApp public void run () { // show the window - _frame.show(); + _frame.setVisible(true); _framemgr.start(); } diff --git a/tests/src/java/com/threerings/util/DirectionViz.java b/tests/src/java/com/threerings/util/DirectionViz.java index 6d3c2472..22fba62c 100644 --- a/tests/src/java/com/threerings/util/DirectionViz.java +++ b/tests/src/java/com/threerings/util/DirectionViz.java @@ -78,7 +78,7 @@ public class DirectionViz extends JPanel frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); frame.getContentPane().add(new DirectionViz(), BorderLayout.CENTER); frame.setSize(300, 300); - frame.show(); + frame.setVisible(true); } protected Point _center; diff --git a/tests/src/java/com/threerings/util/KeyTimerApp.java b/tests/src/java/com/threerings/util/KeyTimerApp.java index 0be875f7..11fdd8f0 100644 --- a/tests/src/java/com/threerings/util/KeyTimerApp.java +++ b/tests/src/java/com/threerings/util/KeyTimerApp.java @@ -37,7 +37,7 @@ public class KeyTimerApp public void run () { - _frame.show(); + _frame.setVisible(true); } public static void main (String[] args) diff --git a/tests/src/java/com/threerings/util/KeyboardManagerApp.java b/tests/src/java/com/threerings/util/KeyboardManagerApp.java index 12956d26..8ac00556 100644 --- a/tests/src/java/com/threerings/util/KeyboardManagerApp.java +++ b/tests/src/java/com/threerings/util/KeyboardManagerApp.java @@ -42,7 +42,7 @@ public class KeyboardManagerApp public void run () { - _frame.show(); + _frame.setVisible(true); } public static void main (String[] args)