Import cleanup.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2968 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2004-02-25 14:39:34 +00:00
parent 5e00fadbfc
commit 61d46f2768
22 changed files with 24 additions and 89 deletions
@@ -1,13 +1,11 @@
//
// $Id: AdminService.java,v 1.2 2002/08/14 19:07:48 mdb Exp $
// $Id: AdminService.java,v 1.3 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.client;
import com.threerings.presents.client.Client;
import com.threerings.presents.client.InvocationService;
import com.threerings.admin.Log;
/**
* Defines the client side of the admin invocation services.
*/
@@ -1,18 +1,13 @@
//
// $Id: ConfigEditorPanel.java,v 1.6 2002/09/25 03:01:14 mdb Exp $
// $Id: ConfigEditorPanel.java,v 1.7 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.client;
import java.awt.Font;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.event.AncestorEvent;
import com.samskivert.swing.VGroupLayout;
import com.samskivert.swing.event.AncestorAdapter;
import com.samskivert.util.StringUtil;
import com.threerings.media.SafeScrollPane;
import com.threerings.presents.util.PresentsContext;
@@ -1,5 +1,5 @@
//
// $Id: FieldEditor.java,v 1.8 2003/10/27 05:34:19 mdb Exp $
// $Id: FieldEditor.java,v 1.9 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.client;
@@ -14,10 +14,8 @@ import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
import javax.swing.event.AncestorEvent;
import com.samskivert.swing.HGroupLayout;
import com.samskivert.swing.event.AncestorAdapter;
import com.samskivert.util.StringUtil;
import com.threerings.presents.dobj.AttributeChangeListener;
@@ -1,10 +1,9 @@
//
// $Id: AdminMarshaller.java,v 1.2 2002/08/20 19:38:13 mdb Exp $
// $Id: AdminMarshaller.java,v 1.3 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.data;
import com.threerings.admin.client.AdminService;
import com.threerings.admin.client.AdminService.ConfigInfoListener;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -17,7 +16,7 @@ import com.threerings.presents.dobj.InvocationResponseEvent;
* to the requesting client.
*
* <p> Generated from <code>
* $Id: AdminMarshaller.java,v 1.2 2002/08/20 19:38:13 mdb Exp $
* $Id: AdminMarshaller.java,v 1.3 2004/02/25 14:39:14 mdb Exp $
* </code>
*/
public class AdminMarshaller extends InvocationMarshaller
@@ -1,12 +1,10 @@
//
// $Id: AdminDispatcher.java,v 1.2 2002/08/20 19:38:13 mdb Exp $
// $Id: AdminDispatcher.java,v 1.3 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.server;
import com.threerings.admin.client.AdminService;
import com.threerings.admin.client.AdminService.ConfigInfoListener;
import com.threerings.admin.data.AdminMarshaller;
import com.threerings.presents.client.Client;
import com.threerings.presents.data.ClientObject;
import com.threerings.presents.data.InvocationMarshaller;
import com.threerings.presents.server.InvocationDispatcher;
@@ -16,7 +14,7 @@ import com.threerings.presents.server.InvocationException;
* Dispatches requests to the {@link AdminProvider}.
*
* <p> Generated from <code>
* $Id: AdminDispatcher.java,v 1.2 2002/08/20 19:38:13 mdb Exp $
* $Id: AdminDispatcher.java,v 1.3 2004/02/25 14:39:14 mdb Exp $
* </code>
*/
public class AdminDispatcher extends InvocationDispatcher
@@ -1,5 +1,5 @@
//
// $Id: AdminProvider.java,v 1.2 2002/08/14 19:07:48 mdb Exp $
// $Id: AdminProvider.java,v 1.3 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.server;
@@ -7,7 +7,6 @@ import com.threerings.presents.data.ClientObject;
import com.threerings.presents.server.InvocationManager;
import com.threerings.presents.server.InvocationProvider;
import com.threerings.admin.Log;
import com.threerings.admin.client.AdminService;
/**
@@ -1,5 +1,5 @@
//
// $Id: ConfObjRegistry.java,v 1.6 2003/09/18 21:35:02 mdb Exp $
// $Id: ConfObjRegistry.java,v 1.7 2004/02/25 14:39:14 mdb Exp $
package com.threerings.admin.server;
@@ -10,9 +10,7 @@ import java.util.HashMap;
import java.util.Iterator;
import com.samskivert.util.Config;
import com.samskivert.util.StringUtil;
import com.threerings.presents.dobj.AccessController;
import com.threerings.presents.dobj.AttributeChangeListener;
import com.threerings.presents.dobj.AttributeChangedEvent;
import com.threerings.presents.dobj.DObject;
@@ -1,13 +1,9 @@
//
// $Id: ActionFrames.java,v 1.9 2003/01/20 19:37:58 mdb Exp $
// $Id: ActionFrames.java,v 1.10 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast;
import java.awt.Graphics;
import java.awt.Image;
import com.threerings.media.image.Colorization;
import com.threerings.util.DirectionCodes;
/**
* Encapsulates a set of frames in each of {@link
@@ -1,5 +1,5 @@
//
// $Id: CharacterComponent.java,v 1.8 2002/08/19 22:58:15 mdb Exp $
// $Id: CharacterComponent.java,v 1.9 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast;
@@ -7,8 +7,6 @@ import java.io.Serializable;
import com.samskivert.util.StringUtil;
import com.threerings.media.sprite.Sprite;
/**
* The character component represents a single component that can be
* composited with other character components to generate an image
@@ -1,5 +1,5 @@
//
// $Id: CharacterManager.java,v 1.33 2003/01/20 19:37:58 mdb Exp $
// $Id: CharacterManager.java,v 1.34 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast;
@@ -8,7 +8,6 @@ import java.util.HashMap;
import com.samskivert.util.LRUHashMap;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Throttle;
import com.samskivert.util.Tuple;
@@ -1,15 +1,13 @@
//
// $Id: CharacterSprite.java,v 1.45 2003/07/28 04:06:38 mdb Exp $
// $Id: CharacterSprite.java,v 1.46 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import javax.swing.SwingUtilities;
import com.threerings.media.sprite.ImageSprite;
import com.threerings.media.util.Path;
/**
* A character sprite is a sprite that animates itself while walking
@@ -1,5 +1,5 @@
//
// $Id: ComponentClass.java,v 1.8 2002/12/19 21:44:12 mdb Exp $
// $Id: ComponentClass.java,v 1.9 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast;
@@ -8,8 +8,6 @@ import java.io.Serializable;
import com.samskivert.util.ArrayIntSet;
import com.samskivert.util.SortableArrayList;
import com.threerings.util.DirectionUtil;
/**
* Denotes a class of components to which {@link CharacterComponent}
* objects belong. Examples include "Hat", "Head", and "Feet". A component
@@ -1,24 +1,13 @@
//
// $Id: CompositedActionFrames.java,v 1.15 2003/01/20 19:37:58 mdb Exp $
// $Id: CompositedActionFrames.java,v 1.16 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.util.Arrays;
import java.util.Comparator;
import com.samskivert.util.LRUHashMap;
import com.samskivert.util.StringUtil;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.Mirage;
import com.threerings.media.image.VolatileMirage;
import com.threerings.media.util.MultiFrameImage;
import com.threerings.cast.CharacterComponent;
import com.threerings.util.DirectionCodes;
@@ -1,5 +1,5 @@
//
// $Id: BuilderModel.java,v 1.4 2001/11/27 08:09:35 mdb Exp $
// $Id: BuilderModel.java,v 1.5 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.builder;
@@ -8,7 +8,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import com.samskivert.util.CollectionUtil;
@@ -1,5 +1,5 @@
//
// $Id: ClassEditor.java,v 1.3 2001/11/27 08:09:35 mdb Exp $
// $Id: ClassEditor.java,v 1.4 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.builder;
@@ -11,9 +11,7 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.samskivert.swing.*;
import com.samskivert.util.StringUtil;
import com.threerings.cast.Log;
import com.threerings.cast.ComponentClass;
/**
@@ -1,13 +1,11 @@
//
// $Id: ComponentPanel.java,v 1.7 2002/06/19 23:24:04 mdb Exp $
// $Id: ComponentPanel.java,v 1.8 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.builder;
import java.util.List;
import java.util.Map;
import javax.swing.*;
import javax.swing.border.Border;
import com.samskivert.swing.*;
@@ -1,21 +1,16 @@
//
// $Id: SpritePanel.java,v 1.16 2003/01/18 03:13:08 mdb Exp $
// $Id: SpritePanel.java,v 1.17 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.builder;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.swing.JPanel;
import java.util.List;
import com.threerings.util.DirectionCodes;
import com.threerings.cast.Log;
import com.threerings.cast.CharacterDescriptor;
import com.threerings.cast.CharacterManager;
import com.threerings.cast.CharacterSprite;
@@ -1,9 +1,8 @@
//
// $Id: BundleUtil.java,v 1.6 2003/05/14 21:34:01 ray Exp $
// $Id: BundleUtil.java,v 1.7 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.bundle;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InvalidClassException;
@@ -1,17 +1,13 @@
//
// $Id: BundledComponentRepository.java,v 1.29 2003/07/02 00:01:17 mdb Exp $
// $Id: BundledComponentRepository.java,v 1.30 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.bundle;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -32,15 +28,12 @@ import com.threerings.media.image.Colorization;
import com.threerings.media.image.FastImageIO;
import com.threerings.media.image.ImageDataProvider;
import com.threerings.media.image.ImageManager;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage;
import com.threerings.media.tile.IMImageProvider;
import com.threerings.media.tile.NoSuchTileException;
import com.threerings.media.tile.Tile;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TrimmedTile;
import com.threerings.media.util.MultiFrameImage;
import com.threerings.util.DirectionCodes;
@@ -1,10 +1,8 @@
//
// $Id: ComponentBundlerTask.java,v 1.19 2003/06/17 23:29:33 ray Exp $
// $Id: ComponentBundlerTask.java,v 1.20 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.bundle.tools;
import java.awt.Image;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import javax.imageio.ImageIO;
@@ -28,17 +26,13 @@ import java.util.jar.JarOutputStream;
import java.util.jar.JarEntry;
import java.util.zip.Deflater;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import com.samskivert.io.PersistenceException;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.SortableArrayList;
import com.samskivert.util.StringUtil;
import com.samskivert.util.Tuple;
import org.apache.commons.io.StreamUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.Task;
@@ -1,5 +1,5 @@
//
// $Id: MetadataBundlerTask.java,v 1.4 2003/06/17 23:29:33 ray Exp $
// $Id: MetadataBundlerTask.java,v 1.5 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.bundle.tools;
@@ -9,7 +9,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
@@ -22,7 +21,6 @@ import java.util.zip.Deflater;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.xml.sax.SAXException;
import org.apache.commons.digester.Digester;
import com.samskivert.util.Tuple;
@@ -1,5 +1,5 @@
//
// $Id: CastUtil.java,v 1.9 2002/04/15 18:18:20 mdb Exp $
// $Id: CastUtil.java,v 1.10 2004/02/25 14:39:34 mdb Exp $
package com.threerings.cast.util;
@@ -7,11 +7,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import com.samskivert.util.CollectionUtil;
import com.samskivert.util.StringUtil;
import com.threerings.util.RandomUtil;
import com.threerings.cast.CharacterDescriptor;
import com.threerings.cast.CharacterManager;
import com.threerings.cast.ComponentClass;
import com.threerings.cast.ComponentRepository;
import com.threerings.cast.Log;