More import cleanups to go with r662, along with a little bit of foreaching, widening, etc.
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@664 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -23,9 +23,8 @@ package com.threerings.cast;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Graphics;
|
||||
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.MouseMotionListener;
|
||||
|
||||
@@ -34,11 +33,13 @@ import javax.swing.JPanel;
|
||||
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
import com.threerings.util.DirectionCodes;
|
||||
import com.threerings.util.DirectionUtil;
|
||||
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
|
||||
import com.threerings.cast.bundle.BundledComponentRepository;
|
||||
|
||||
/**
|
||||
|
||||
@@ -22,13 +22,15 @@
|
||||
package com.threerings.cast.builder;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.swing.JFrame;
|
||||
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
|
||||
import com.threerings.cast.CharacterManager;
|
||||
import com.threerings.cast.ComponentRepository;
|
||||
import com.threerings.cast.bundle.BundledComponentRepository;
|
||||
|
||||
@@ -21,16 +21,19 @@
|
||||
|
||||
package com.threerings.cast.bundle;
|
||||
|
||||
import java.awt.Component;
|
||||
import java.util.Iterator;
|
||||
|
||||
import com.threerings.cast.ComponentClass;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
import java.awt.Component;
|
||||
|
||||
import junit.framework.Test;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
|
||||
import com.threerings.cast.ComponentClass;
|
||||
|
||||
public class BundledComponentRepositoryTest extends TestCase
|
||||
{
|
||||
public BundledComponentRepositoryTest ()
|
||||
|
||||
@@ -25,7 +25,6 @@ import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Point;
|
||||
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.MouseMotionListener;
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Point;
|
||||
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.MouseMotionListener;
|
||||
|
||||
|
||||
@@ -21,10 +21,13 @@
|
||||
|
||||
package com.threerings.media;
|
||||
|
||||
import java.awt.image.BufferedImage;
|
||||
import javax.imageio.ImageIO;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
import java.io.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import com.threerings.resource.FastImageIO;
|
||||
|
||||
|
||||
@@ -22,14 +22,18 @@
|
||||
package com.threerings.media;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import javax.swing.*;
|
||||
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JPanel;
|
||||
|
||||
import com.samskivert.swing.HGroupLayout;
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.tile.TileManager;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
/**
|
||||
* Does something extraordinary.
|
||||
|
||||
@@ -21,16 +21,18 @@
|
||||
|
||||
package com.threerings.media.tile.bundle;
|
||||
|
||||
import java.awt.Component;
|
||||
import java.util.Iterator;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.tile.TileSet;
|
||||
import com.threerings.resource.ResourceManager;
|
||||
import java.awt.Component;
|
||||
|
||||
import junit.framework.Test;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.tile.TileSet;
|
||||
|
||||
public class BundledTileSetRepositoryTest extends TestCase
|
||||
{
|
||||
public BundledTileSetRepositoryTest ()
|
||||
|
||||
@@ -21,9 +21,10 @@
|
||||
|
||||
package com.threerings.media.tile.bundle.tools;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
|
||||
import com.samskivert.io.PersistenceException;
|
||||
import com.samskivert.test.TestUtil;
|
||||
|
||||
@@ -21,15 +21,16 @@
|
||||
|
||||
package com.threerings.media.tile.tools.xml;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
|
||||
import com.threerings.media.tile.TileSet;
|
||||
import java.io.IOException;
|
||||
|
||||
import junit.framework.Test;
|
||||
import junit.framework.TestCase;
|
||||
|
||||
import com.threerings.media.tile.TileSet;
|
||||
|
||||
public class XMLTileSetParserTest extends TestCase
|
||||
{
|
||||
public XMLTileSetParserTest ()
|
||||
|
||||
@@ -26,12 +26,12 @@ import java.awt.Dimension;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Point;
|
||||
import java.awt.Rectangle;
|
||||
|
||||
import javax.swing.JFrame;
|
||||
|
||||
import com.threerings.media.FrameManager;
|
||||
import com.threerings.media.ManagedJFrame;
|
||||
import com.threerings.media.MediaPanel;
|
||||
|
||||
import com.threerings.media.sprite.Sprite;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,15 +21,14 @@
|
||||
|
||||
package com.threerings.media.util;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Image;
|
||||
import java.awt.image.BufferedImage;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
|
||||
@@ -21,11 +21,11 @@
|
||||
|
||||
package com.threerings.miso.client;
|
||||
|
||||
import java.awt.Rectangle;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Random;
|
||||
|
||||
import java.awt.Rectangle;
|
||||
|
||||
import com.samskivert.io.PersistenceException;
|
||||
|
||||
import com.threerings.media.tile.NoSuchTileSetException;
|
||||
@@ -33,11 +33,11 @@ import com.threerings.media.tile.TileSet;
|
||||
import com.threerings.media.tile.TileSetRepository;
|
||||
|
||||
import com.threerings.miso.data.MisoSceneModel;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
import com.threerings.miso.tile.BaseTile;
|
||||
import com.threerings.miso.tile.BaseTileSet;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
import com.threerings.miso.util.ObjectSet;
|
||||
import com.threerings.miso.data.ObjectInfo;
|
||||
|
||||
/**
|
||||
* Provides an infinite array of tiles in which to scroll.
|
||||
|
||||
@@ -21,27 +21,30 @@
|
||||
|
||||
package com.threerings.miso.client;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.awt.DisplayMode;
|
||||
import java.awt.GraphicsConfiguration;
|
||||
import java.awt.GraphicsDevice;
|
||||
import java.awt.GraphicsEnvironment;
|
||||
|
||||
import java.io.IOException;
|
||||
import com.samskivert.util.Config;
|
||||
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
import com.samskivert.util.Config;
|
||||
|
||||
import com.threerings.resource.ResourceManager;
|
||||
|
||||
import com.threerings.media.FrameManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.sprite.PathAdapter;
|
||||
import com.threerings.media.sprite.Sprite;
|
||||
import com.threerings.media.tile.bundle.BundledTileSetRepository;
|
||||
import com.threerings.media.util.LinePath;
|
||||
import com.threerings.media.util.Path;
|
||||
|
||||
import com.threerings.media.sprite.PathAdapter;
|
||||
import com.threerings.media.sprite.Sprite;
|
||||
|
||||
import com.threerings.media.tile.bundle.BundledTileSetRepository;
|
||||
import com.threerings.miso.MisoConfig;
|
||||
import com.threerings.miso.tile.MisoTileManager;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
|
||||
import com.threerings.cast.CharacterComponent;
|
||||
import com.threerings.cast.CharacterDescriptor;
|
||||
@@ -50,10 +53,6 @@ import com.threerings.cast.CharacterSprite;
|
||||
import com.threerings.cast.NoSuchComponentException;
|
||||
import com.threerings.cast.bundle.BundledComponentRepository;
|
||||
|
||||
import com.threerings.miso.MisoConfig;
|
||||
import com.threerings.miso.tile.MisoTileManager;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
|
||||
import static com.threerings.miso.Log.log;
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,11 +21,12 @@
|
||||
|
||||
package com.threerings.miso.viewer;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import java.awt.DisplayMode;
|
||||
import java.awt.GraphicsConfiguration;
|
||||
import java.awt.GraphicsDevice;
|
||||
import java.awt.GraphicsEnvironment;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.samskivert.swing.util.SwingUtil;
|
||||
|
||||
@@ -35,14 +36,14 @@ import com.threerings.media.FrameManager;
|
||||
import com.threerings.media.image.ClientImageManager;
|
||||
import com.threerings.media.tile.bundle.BundledTileSetRepository;
|
||||
|
||||
import com.threerings.cast.CharacterManager;
|
||||
import com.threerings.cast.bundle.BundledComponentRepository;
|
||||
|
||||
import com.threerings.miso.data.SimpleMisoSceneModel;
|
||||
import com.threerings.miso.tile.MisoTileManager;
|
||||
import com.threerings.miso.tools.xml.SimpleMisoSceneParser;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
|
||||
import com.threerings.cast.CharacterManager;
|
||||
import com.threerings.cast.bundle.BundledComponentRepository;
|
||||
|
||||
import static com.threerings.miso.Log.log;
|
||||
|
||||
/**
|
||||
|
||||
@@ -27,17 +27,10 @@ import java.awt.event.MouseEvent;
|
||||
|
||||
import com.samskivert.util.RandomUtil;
|
||||
|
||||
import com.threerings.cast.CharacterDescriptor;
|
||||
import com.threerings.cast.CharacterManager;
|
||||
import com.threerings.cast.CharacterSprite;
|
||||
import com.threerings.cast.ComponentRepository;
|
||||
import com.threerings.cast.util.CastUtil;
|
||||
|
||||
import com.threerings.media.sprite.PathObserver;
|
||||
import com.threerings.media.sprite.Sprite;
|
||||
import com.threerings.media.sprite.SpriteManager;
|
||||
import com.threerings.media.util.LineSegmentPath;
|
||||
|
||||
import com.threerings.media.util.Path;
|
||||
import com.threerings.media.util.PerformanceMonitor;
|
||||
import com.threerings.media.util.PerformanceObserver;
|
||||
@@ -47,6 +40,12 @@ import com.threerings.miso.client.MisoScenePanel;
|
||||
import com.threerings.miso.data.MisoSceneModel;
|
||||
import com.threerings.miso.util.MisoContext;
|
||||
|
||||
import com.threerings.cast.CharacterDescriptor;
|
||||
import com.threerings.cast.CharacterManager;
|
||||
import com.threerings.cast.CharacterSprite;
|
||||
import com.threerings.cast.ComponentRepository;
|
||||
import com.threerings.cast.util.CastUtil;
|
||||
|
||||
import static com.threerings.miso.Log.log;
|
||||
|
||||
public class ViewerSceneViewPanel extends MisoScenePanel
|
||||
|
||||
@@ -25,7 +25,6 @@ import java.awt.BorderLayout;
|
||||
import java.awt.Color;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Point;
|
||||
|
||||
import java.awt.event.MouseEvent;
|
||||
import java.awt.event.MouseMotionListener;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user