diff --git a/src/java/com/threerings/cast/ActionFrames.java b/src/java/com/threerings/cast/ActionFrames.java index 0c6f334b..8811d05c 100644 --- a/src/java/com/threerings/cast/ActionFrames.java +++ b/src/java/com/threerings/cast/ActionFrames.java @@ -21,9 +21,10 @@ package com.threerings.cast; -import com.threerings.media.image.Colorization; import com.threerings.util.DirectionCodes; +import com.threerings.media.image.Colorization; + /** * Encapsulates a set of frames in each of {@link * DirectionCodes#DIRECTION_COUNT} orientations that are used to render a diff --git a/src/java/com/threerings/cast/ActionSequence.java b/src/java/com/threerings/cast/ActionSequence.java index 1690c608..fc292d2c 100644 --- a/src/java/com/threerings/cast/ActionSequence.java +++ b/src/java/com/threerings/cast/ActionSequence.java @@ -22,6 +22,7 @@ package com.threerings.cast; import java.awt.Point; + import java.io.Serializable; /** diff --git a/src/java/com/threerings/cast/CharacterComponent.java b/src/java/com/threerings/cast/CharacterComponent.java index 3273974c..8d1c0337 100644 --- a/src/java/com/threerings/cast/CharacterComponent.java +++ b/src/java/com/threerings/cast/CharacterComponent.java @@ -21,9 +21,10 @@ package com.threerings.cast; -import java.io.Serializable; import java.util.Set; +import java.io.Serializable; + import com.samskivert.util.StringUtil; import com.threerings.media.sprite.Sprite; diff --git a/src/java/com/threerings/cast/CharacterDescriptor.java b/src/java/com/threerings/cast/CharacterDescriptor.java index b934175e..2b7916b1 100644 --- a/src/java/com/threerings/cast/CharacterDescriptor.java +++ b/src/java/com/threerings/cast/CharacterDescriptor.java @@ -22,8 +22,11 @@ package com.threerings.cast; import java.awt.Point; + import java.util.Arrays; + import com.samskivert.util.StringUtil; + import com.threerings.media.image.Colorization; /** diff --git a/src/java/com/threerings/cast/CharacterManager.java b/src/java/com/threerings/cast/CharacterManager.java index 555fccde..cb6e5063 100644 --- a/src/java/com/threerings/cast/CharacterManager.java +++ b/src/java/com/threerings/cast/CharacterManager.java @@ -30,14 +30,17 @@ import java.util.Map; import com.google.common.collect.Maps; -import com.samskivert.swing.RuntimeAdjust; import com.samskivert.util.LRUHashMap; import com.samskivert.util.StringUtil; import com.samskivert.util.Throttle; import com.samskivert.util.Tuple; + +import com.samskivert.swing.RuntimeAdjust; + +import com.threerings.util.DirectionCodes; + import com.threerings.media.image.Colorization; import com.threerings.media.image.ImageManager; -import com.threerings.util.DirectionCodes; import com.threerings.cast.CompositedActionFrames.ComponentFrames; import com.threerings.cast.CompositedActionFrames.CompositedFramesKey; diff --git a/src/java/com/threerings/cast/CharacterSprite.java b/src/java/com/threerings/cast/CharacterSprite.java index 828bdc63..378b8deb 100644 --- a/src/java/com/threerings/cast/CharacterSprite.java +++ b/src/java/com/threerings/cast/CharacterSprite.java @@ -24,6 +24,7 @@ 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; diff --git a/src/java/com/threerings/cast/CompositedActionFrames.java b/src/java/com/threerings/cast/CompositedActionFrames.java index fca0cbe5..854b290e 100644 --- a/src/java/com/threerings/cast/CompositedActionFrames.java +++ b/src/java/com/threerings/cast/CompositedActionFrames.java @@ -25,13 +25,12 @@ import java.util.Map; import com.samskivert.util.StringUtil; -import com.threerings.media.image.ImageManager; -import com.threerings.media.image.Colorization; -import com.threerings.media.util.MultiFrameImage; - -import com.threerings.cast.CharacterComponent; import com.threerings.util.DirectionCodes; +import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageManager; +import com.threerings.media.util.MultiFrameImage; + /** * An implementation of the {@link MultiFrameImage} interface that is used * to lazily create composited character frames when they are requested. diff --git a/src/java/com/threerings/cast/CompositedMaskedImage.java b/src/java/com/threerings/cast/CompositedMaskedImage.java index ff938407..14ee83c9 100644 --- a/src/java/com/threerings/cast/CompositedMaskedImage.java +++ b/src/java/com/threerings/cast/CompositedMaskedImage.java @@ -24,6 +24,7 @@ package com.threerings.cast; import java.awt.AlphaComposite; import java.awt.Graphics2D; import java.awt.Rectangle; + import com.threerings.media.image.ImageManager; import com.threerings.media.image.VolatileMirage; diff --git a/src/java/com/threerings/cast/CompositedMultiFrameImage.java b/src/java/com/threerings/cast/CompositedMultiFrameImage.java index 31103dbd..b1950843 100644 --- a/src/java/com/threerings/cast/CompositedMultiFrameImage.java +++ b/src/java/com/threerings/cast/CompositedMultiFrameImage.java @@ -26,15 +26,17 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.Transparency; import java.awt.image.BufferedImage; + import java.util.Arrays; import java.util.Comparator; -import com.threerings.cast.CompositedActionFrames.ComponentFrames; -import com.threerings.cast.bundle.BundledComponentRepository.TileSetFrameImage; import com.threerings.media.image.ImageManager; import com.threerings.media.image.Mirage; import com.threerings.media.image.VolatileMirage; +import com.threerings.cast.CompositedActionFrames.ComponentFrames; +import com.threerings.cast.bundle.BundledComponentRepository.TileSetFrameImage; + /** * Used to composite the action frames for a particular orientation of a * {@link CompositedActionFrames}. diff --git a/src/java/com/threerings/cast/builder/BuilderModel.java b/src/java/com/threerings/cast/builder/BuilderModel.java index 2bcb0463..94fac3a1 100644 --- a/src/java/com/threerings/cast/builder/BuilderModel.java +++ b/src/java/com/threerings/cast/builder/BuilderModel.java @@ -29,8 +29,8 @@ import java.util.List; import com.samskivert.util.CollectionUtil; -import com.threerings.cast.ComponentRepository; import com.threerings.cast.ComponentClass; +import com.threerings.cast.ComponentRepository; /** * The builder model represents the current state of the character the diff --git a/src/java/com/threerings/cast/builder/BuilderPanel.java b/src/java/com/threerings/cast/builder/BuilderPanel.java index a8741165..397ee1e3 100644 --- a/src/java/com/threerings/cast/builder/BuilderPanel.java +++ b/src/java/com/threerings/cast/builder/BuilderPanel.java @@ -21,7 +21,9 @@ package com.threerings.cast.builder; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; + import com.samskivert.swing.HGroupLayout; import com.samskivert.swing.VGroupLayout; diff --git a/src/java/com/threerings/cast/builder/ClassEditor.java b/src/java/com/threerings/cast/builder/ClassEditor.java index 9ab9ac25..3ab064ed 100644 --- a/src/java/com/threerings/cast/builder/ClassEditor.java +++ b/src/java/com/threerings/cast/builder/ClassEditor.java @@ -23,8 +23,9 @@ package com.threerings.cast.builder; import java.util.List; -import javax.swing.*; - +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JSlider; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; diff --git a/src/java/com/threerings/cast/builder/ComponentPanel.java b/src/java/com/threerings/cast/builder/ComponentPanel.java index 038b802a..13d9d6e0 100644 --- a/src/java/com/threerings/cast/builder/ComponentPanel.java +++ b/src/java/com/threerings/cast/builder/ComponentPanel.java @@ -23,11 +23,12 @@ package com.threerings.cast.builder; import java.util.List; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; import com.samskivert.swing.VGroupLayout; -import com.threerings.cast.*; +import com.threerings.cast.ComponentClass; import static com.threerings.cast.Log.log; diff --git a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java index 3a5faadb..f5cc0c0c 100644 --- a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java +++ b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java @@ -21,17 +21,17 @@ package com.threerings.cast.bundle; -import static com.threerings.cast.Log.log; - import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; -import java.io.IOException; + import java.util.ArrayList; import java.util.Iterator; import java.util.Map; import java.util.Set; +import java.io.IOException; + import com.google.common.collect.Maps; import com.samskivert.util.IntIntMap; @@ -40,6 +40,22 @@ import com.samskivert.util.IntMaps; import com.samskivert.util.Predicate; import com.samskivert.util.Tuple; +import com.threerings.util.DirectionCodes; + +import com.threerings.resource.FileResourceBundle; +import com.threerings.resource.ResourceBundle; +import com.threerings.resource.ResourceManager; + +import com.threerings.media.image.BufferedMirage; +import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageDataProvider; +import com.threerings.media.image.ImageManager; +import com.threerings.media.image.Mirage; +import com.threerings.media.tile.IMImageProvider; +import com.threerings.media.tile.Tile; +import com.threerings.media.tile.TileSet; +import com.threerings.media.tile.TrimmedTile; + import com.threerings.cast.ActionFrames; import com.threerings.cast.ActionSequence; import com.threerings.cast.CharacterComponent; @@ -49,19 +65,8 @@ import com.threerings.cast.FrameProvider; import com.threerings.cast.NoSuchComponentException; import com.threerings.cast.StandardActions; import com.threerings.cast.TrimmedMultiFrameImage; -import com.threerings.media.image.BufferedMirage; -import com.threerings.media.image.Colorization; -import com.threerings.media.image.ImageDataProvider; -import com.threerings.media.image.ImageManager; -import com.threerings.media.image.Mirage; -import com.threerings.media.tile.IMImageProvider; -import com.threerings.media.tile.Tile; -import com.threerings.media.tile.TileSet; -import com.threerings.media.tile.TrimmedTile; -import com.threerings.resource.FileResourceBundle; -import com.threerings.resource.ResourceBundle; -import com.threerings.resource.ResourceManager; -import com.threerings.util.DirectionCodes; + +import static com.threerings.cast.Log.log; /** * A component repository implementation that obtains information from resource bundles. diff --git a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java index ce7afce7..0862732e 100644 --- a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java +++ b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java @@ -22,6 +22,14 @@ package com.threerings.cast.bundle.tools; import java.awt.image.BufferedImage; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; +import java.util.zip.Deflater; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -34,12 +42,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.jar.JarEntry; -import java.util.jar.JarOutputStream; -import java.util.zip.Deflater; import javax.imageio.ImageIO; @@ -54,10 +56,7 @@ import com.samskivert.util.ComparableArrayList; import com.samskivert.util.FileUtil; import com.samskivert.util.HashIntMap; import com.samskivert.util.Tuple; -import com.threerings.cast.ComponentIDBroker; -import com.threerings.cast.StandardActions; -import com.threerings.cast.bundle.BundleUtil; -import com.threerings.cast.tools.xml.ActionRuleSet; + import com.threerings.media.tile.ImageProvider; import com.threerings.media.tile.SimpleCachingImageProvider; import com.threerings.media.tile.TileSet; @@ -66,6 +65,11 @@ import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet; import com.threerings.media.tile.tools.xml.TileSetRuleSet; import com.threerings.media.tile.tools.xml.UniformTileSetRuleSet; +import com.threerings.cast.ComponentIDBroker; +import com.threerings.cast.StandardActions; +import com.threerings.cast.bundle.BundleUtil; +import com.threerings.cast.tools.xml.ActionRuleSet; + /** * Ant task for creating component bundles. This task must be configured * with a number of parameters: diff --git a/src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java index 0a3dad94..e0ecf583 100644 --- a/src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java +++ b/src/java/com/threerings/cast/bundle/tools/DirectoryComponentBundlerTask.java @@ -22,7 +22,6 @@ package com.threerings.cast.bundle.tools; import java.io.File; - import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java index faf6a1f8..8daaae67 100644 --- a/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java +++ b/src/java/com/threerings/cast/bundle/tools/DirectoryMetadataBundlerTask.java @@ -22,7 +22,6 @@ package com.threerings.cast.bundle.tools; import java.io.File; - import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/java/com/threerings/cast/bundle/tools/DumpBundle.java b/src/java/com/threerings/cast/bundle/tools/DumpBundle.java index ab655a26..862da678 100644 --- a/src/java/com/threerings/cast/bundle/tools/DumpBundle.java +++ b/src/java/com/threerings/cast/bundle/tools/DumpBundle.java @@ -21,17 +21,19 @@ package com.threerings.cast.bundle.tools; -import java.io.File; import java.util.HashMap; import java.util.Map; +import java.io.File; + import com.samskivert.util.HashIntMap; import com.samskivert.util.StringUtil; -import com.threerings.cast.bundle.BundleUtil; import com.threerings.resource.FileResourceBundle; import com.threerings.resource.ResourceBundle; +import com.threerings.cast.bundle.BundleUtil; + /** * Dumps the contents of a component bundle to stdout. */ diff --git a/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java index 59542432..090bba01 100644 --- a/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java +++ b/src/java/com/threerings/cast/bundle/tools/MetadataBundlerTask.java @@ -21,6 +21,13 @@ package com.threerings.cast.bundle.tools; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.jar.JarEntry; +import java.util.jar.JarOutputStream; +import java.util.zip.Deflater; + import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -29,27 +36,23 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.jar.JarEntry; -import java.util.jar.JarOutputStream; -import java.util.zip.Deflater; import org.apache.commons.digester.Digester; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import com.samskivert.util.Tuple; + +import com.threerings.media.tile.TileSet; +import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet; +import com.threerings.media.tile.tools.xml.TileSetRuleSet; +import com.threerings.media.tile.tools.xml.UniformTileSetRuleSet; + import com.threerings.cast.ActionSequence; import com.threerings.cast.ComponentClass; import com.threerings.cast.bundle.BundleUtil; import com.threerings.cast.tools.xml.ActionRuleSet; import com.threerings.cast.tools.xml.ClassRuleSet; -import com.threerings.media.tile.TileSet; -import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet; -import com.threerings.media.tile.tools.xml.TileSetRuleSet; -import com.threerings.media.tile.tools.xml.UniformTileSetRuleSet; /** * Ant task for creating metadata bundles, which contain action sequence diff --git a/src/java/com/threerings/cast/tools/xml/ActionRuleSet.java b/src/java/com/threerings/cast/tools/xml/ActionRuleSet.java index dd15ee9f..7aca3763 100644 --- a/src/java/com/threerings/cast/tools/xml/ActionRuleSet.java +++ b/src/java/com/threerings/cast/tools/xml/ActionRuleSet.java @@ -25,7 +25,6 @@ import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; import com.samskivert.util.StringUtil; - import com.samskivert.xml.CallMethodSpecialRule; import com.samskivert.xml.SetFieldRule; import com.samskivert.xml.SetPropertyFieldsRule; diff --git a/src/java/com/threerings/cast/tools/xml/ClassRuleSet.java b/src/java/com/threerings/cast/tools/xml/ClassRuleSet.java index ea49881b..8db45e32 100644 --- a/src/java/com/threerings/cast/tools/xml/ClassRuleSet.java +++ b/src/java/com/threerings/cast/tools/xml/ClassRuleSet.java @@ -31,10 +31,11 @@ import com.samskivert.util.StringUtil; import com.samskivert.xml.SetPropertyFieldsRule; import com.samskivert.xml.SetPropertyFieldsRule.FieldParser; -import com.threerings.cast.ComponentClass.PriorityOverride; -import com.threerings.cast.ComponentClass; import com.threerings.util.DirectionUtil; +import com.threerings.cast.ComponentClass; +import com.threerings.cast.ComponentClass.PriorityOverride; + /** * The class rule set is used to parse the attributes of a component class * instance. diff --git a/src/java/com/threerings/media/AbstractMedia.java b/src/java/com/threerings/media/AbstractMedia.java index bbcd6610..38c45e12 100644 --- a/src/java/com/threerings/media/AbstractMedia.java +++ b/src/java/com/threerings/media/AbstractMedia.java @@ -24,7 +24,6 @@ package com.threerings.media; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Shape; - import java.awt.geom.AffineTransform; import java.awt.geom.PathIterator; import java.awt.geom.Point2D; diff --git a/src/java/com/threerings/media/AbstractMediaManager.java b/src/java/com/threerings/media/AbstractMediaManager.java index 35a8a4f0..c3e0a901 100644 --- a/src/java/com/threerings/media/AbstractMediaManager.java +++ b/src/java/com/threerings/media/AbstractMediaManager.java @@ -21,20 +21,22 @@ package com.threerings.media; -import static com.threerings.resource.Log.log; - import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Shape; + import java.util.Comparator; import java.util.List; import com.google.common.collect.Lists; + import com.samskivert.util.ObserverList; import com.samskivert.util.SortableArrayList; import com.samskivert.util.Tuple; import com.samskivert.util.ObserverList.ObserverOp; +import static com.threerings.resource.Log.log; + /** * Manages, ticks, and paints {@link AbstractMedia}. */ diff --git a/src/java/com/threerings/media/ActiveRepaintManager.java b/src/java/com/threerings/media/ActiveRepaintManager.java index 5a6a93ec..b3922803 100644 --- a/src/java/com/threerings/media/ActiveRepaintManager.java +++ b/src/java/com/threerings/media/ActiveRepaintManager.java @@ -24,12 +24,15 @@ package com.threerings.media; import java.applet.Applet; import java.awt.Component; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Image; import java.awt.Rectangle; import java.awt.Window; +import java.util.Iterator; +import java.util.Map; + import javax.swing.CellRendererPane; import javax.swing.JComponent; import javax.swing.JEditorPane; @@ -38,9 +41,6 @@ import javax.swing.JTextField; import javax.swing.RepaintManager; import javax.swing.SwingUtilities; -import java.util.Iterator; -import java.util.Map; - import com.google.common.collect.Maps; import com.samskivert.util.ListUtil; diff --git a/src/java/com/threerings/media/FrameInterval.java b/src/java/com/threerings/media/FrameInterval.java index 42dee225..a2e55f3a 100644 --- a/src/java/com/threerings/media/FrameInterval.java +++ b/src/java/com/threerings/media/FrameInterval.java @@ -23,9 +23,6 @@ package com.threerings.media; import java.awt.Component; -import com.threerings.media.FrameManager; -import com.threerings.media.FrameParticipant; - public abstract class FrameInterval implements FrameParticipant { diff --git a/src/java/com/threerings/media/FrameManager.java b/src/java/com/threerings/media/FrameManager.java index 95f9b511..22ec84d2 100644 --- a/src/java/com/threerings/media/FrameManager.java +++ b/src/java/com/threerings/media/FrameManager.java @@ -22,6 +22,7 @@ package com.threerings.media; import java.applet.Applet; + import java.awt.Component; import java.awt.EventQueue; import java.awt.Graphics2D; @@ -32,11 +33,12 @@ import javax.swing.JLayeredPane; import javax.swing.JRootPane; import javax.swing.RepaintManager; -import com.samskivert.swing.RuntimeAdjust; import com.samskivert.util.ListUtil; import com.samskivert.util.RunAnywhere; import com.samskivert.util.StringUtil; +import com.samskivert.swing.RuntimeAdjust; + import com.threerings.util.unsafe.Unsafe; import com.threerings.media.timer.CalibratingTimer; diff --git a/src/java/com/threerings/media/IconManager.java b/src/java/com/threerings/media/IconManager.java index c5e23efc..9343e6f0 100644 --- a/src/java/com/threerings/media/IconManager.java +++ b/src/java/com/threerings/media/IconManager.java @@ -21,10 +21,11 @@ package com.threerings.media; -import java.io.IOException; import java.util.Map; import java.util.Properties; +import java.io.IOException; + import javax.swing.Icon; import javax.swing.ImageIcon; @@ -33,7 +34,6 @@ import com.samskivert.util.LRUHashMap; import com.samskivert.util.StringUtil; import com.threerings.media.image.ImageUtil; - import com.threerings.media.tile.TileIcon; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; diff --git a/src/java/com/threerings/media/ManagedJApplet.java b/src/java/com/threerings/media/ManagedJApplet.java index bf0ef81d..16213c71 100644 --- a/src/java/com/threerings/media/ManagedJApplet.java +++ b/src/java/com/threerings/media/ManagedJApplet.java @@ -23,6 +23,7 @@ package com.threerings.media; import java.awt.Component; import java.awt.Window; + import javax.swing.JApplet; /** diff --git a/src/java/com/threerings/media/MediaOverlay.java b/src/java/com/threerings/media/MediaOverlay.java index 808fdcc8..ea22e754 100644 --- a/src/java/com/threerings/media/MediaOverlay.java +++ b/src/java/com/threerings/media/MediaOverlay.java @@ -23,6 +23,7 @@ package com.threerings.media; import java.awt.Graphics2D; import java.awt.Rectangle; + import java.util.List; import javax.swing.JRootPane; diff --git a/src/java/com/threerings/media/MediaPanel.java b/src/java/com/threerings/media/MediaPanel.java index 5b2d02fe..16f23e44 100644 --- a/src/java/com/threerings/media/MediaPanel.java +++ b/src/java/com/threerings/media/MediaPanel.java @@ -22,38 +22,35 @@ package com.threerings.media; import java.awt.Component; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.awt.Shape; - import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; +import java.util.ArrayList; + import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.MouseInputAdapter; -import java.util.ArrayList; - import com.samskivert.swing.Controller; import com.samskivert.swing.event.AncestorAdapter; import com.samskivert.swing.event.CommandEvent; -import com.threerings.media.timer.MediaTimer; import com.threerings.media.animation.Animation; import com.threerings.media.animation.AnimationManager; - import com.threerings.media.sprite.Sprite; import com.threerings.media.sprite.SpriteManager; - import com.threerings.media.sprite.action.ActionSprite; import com.threerings.media.sprite.action.ArmingSprite; import com.threerings.media.sprite.action.CommandSprite; import com.threerings.media.sprite.action.DisableableSprite; import com.threerings.media.sprite.action.HoverSprite; +import com.threerings.media.timer.MediaTimer; import static com.threerings.media.Log.log; diff --git a/src/java/com/threerings/media/MetaMediaManager.java b/src/java/com/threerings/media/MetaMediaManager.java index 7c484404..62c7710a 100644 --- a/src/java/com/threerings/media/MetaMediaManager.java +++ b/src/java/com/threerings/media/MetaMediaManager.java @@ -21,13 +21,12 @@ package com.threerings.media; -import static com.threerings.media.Log.log; - import java.awt.Color; import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics2D; import java.awt.Rectangle; + import java.util.Arrays; import java.util.Iterator; @@ -44,6 +43,8 @@ import com.threerings.media.sprite.Sprite; import com.threerings.media.sprite.SpriteManager; import com.threerings.media.timer.MediaTimer; +import static com.threerings.media.Log.log; + /** * Coordinates interaction between a sprite and animation manager and the media host that hosts and * renders them. This class is a little fiddly because {@link MediaPanel} has been around a long diff --git a/src/java/com/threerings/media/RegionManager.java b/src/java/com/threerings/media/RegionManager.java index bbba2161..093bf9d8 100644 --- a/src/java/com/threerings/media/RegionManager.java +++ b/src/java/com/threerings/media/RegionManager.java @@ -23,9 +23,11 @@ package com.threerings.media; import java.awt.EventQueue; import java.awt.Rectangle; + import java.util.List; import com.google.common.collect.Lists; + import com.samskivert.util.StringUtil; import static com.threerings.resource.Log.log; diff --git a/src/java/com/threerings/media/TimerView.java b/src/java/com/threerings/media/TimerView.java index 2caa9cfe..4fa2dc88 100644 --- a/src/java/com/threerings/media/TimerView.java +++ b/src/java/com/threerings/media/TimerView.java @@ -24,11 +24,11 @@ package com.threerings.media; import java.awt.Component; import java.awt.Graphics2D; import java.awt.Rectangle; - import java.awt.event.HierarchyEvent; import java.awt.event.HierarchyListener; import javax.swing.JComponent; + import com.samskivert.util.ResultListener; /** diff --git a/src/java/com/threerings/media/VirtualMediaPanel.java b/src/java/com/threerings/media/VirtualMediaPanel.java index 19709ffa..0b1ee00f 100644 --- a/src/java/com/threerings/media/VirtualMediaPanel.java +++ b/src/java/com/threerings/media/VirtualMediaPanel.java @@ -21,11 +21,12 @@ package com.threerings.media; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.event.MouseEvent; import java.awt.event.MouseWheelEvent; + import java.util.ArrayList; import javax.swing.SwingUtilities; diff --git a/src/java/com/threerings/media/VirtualRangeModel.java b/src/java/com/threerings/media/VirtualRangeModel.java index 99e38b0f..29dc907d 100644 --- a/src/java/com/threerings/media/VirtualRangeModel.java +++ b/src/java/com/threerings/media/VirtualRangeModel.java @@ -25,7 +25,6 @@ import java.awt.Rectangle; import javax.swing.BoundedRangeModel; import javax.swing.DefaultBoundedRangeModel; - import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; diff --git a/src/java/com/threerings/media/animation/AnimationSprite.java b/src/java/com/threerings/media/animation/AnimationSprite.java index f7e15ef6..9ebc3412 100644 --- a/src/java/com/threerings/media/animation/AnimationSprite.java +++ b/src/java/com/threerings/media/animation/AnimationSprite.java @@ -26,7 +26,6 @@ import java.awt.Rectangle; import com.threerings.media.MediaPanel; import com.threerings.media.sprite.Sprite; -import com.threerings.media.animation.Animation; /** * A Sprite that wraps an animation so that a sequence of frames can be easily diff --git a/src/java/com/threerings/media/animation/BobbleAnimation.java b/src/java/com/threerings/media/animation/BobbleAnimation.java index f90c8cf8..9e567954 100644 --- a/src/java/com/threerings/media/animation/BobbleAnimation.java +++ b/src/java/com/threerings/media/animation/BobbleAnimation.java @@ -25,6 +25,7 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import com.samskivert.util.RandomUtil; + import com.threerings.media.image.Mirage; /** diff --git a/src/java/com/threerings/media/animation/SparkAnimation.java b/src/java/com/threerings/media/animation/SparkAnimation.java index e1e38401..2d7c2f0f 100644 --- a/src/java/com/threerings/media/animation/SparkAnimation.java +++ b/src/java/com/threerings/media/animation/SparkAnimation.java @@ -29,7 +29,6 @@ import java.awt.Shape; import com.samskivert.util.RandomUtil; -import com.threerings.media.animation.Animation; import com.threerings.media.image.Mirage; /** diff --git a/src/java/com/threerings/media/animation/SpriteAnimation.java b/src/java/com/threerings/media/animation/SpriteAnimation.java index 5db42579..8e35f0d8 100644 --- a/src/java/com/threerings/media/animation/SpriteAnimation.java +++ b/src/java/com/threerings/media/animation/SpriteAnimation.java @@ -24,9 +24,9 @@ package com.threerings.media.animation; import java.awt.Graphics2D; import java.awt.Rectangle; +import com.threerings.media.sprite.PathObserver; import com.threerings.media.sprite.Sprite; import com.threerings.media.sprite.SpriteManager; -import com.threerings.media.sprite.PathObserver; import com.threerings.media.util.Path; public class SpriteAnimation extends Animation diff --git a/src/java/com/threerings/media/image/ClientImageManager.java b/src/java/com/threerings/media/image/ClientImageManager.java index 85e132e7..79537175 100644 --- a/src/java/com/threerings/media/image/ClientImageManager.java +++ b/src/java/com/threerings/media/image/ClientImageManager.java @@ -26,9 +26,11 @@ import java.awt.Rectangle; import java.awt.image.BufferedImage; import com.samskivert.swing.RuntimeAdjust; -import com.threerings.media.MediaPrefs; + import com.threerings.resource.ResourceManager; +import com.threerings.media.MediaPrefs; + /** * Provides a single point of access for image retrieval and caching - just like the * ImageManager but adds a tie in to the RuntimeAdjust system to control caching and diff --git a/src/java/com/threerings/media/image/ColorPository.java b/src/java/com/threerings/media/image/ColorPository.java index c63a64d7..f00b83d7 100644 --- a/src/java/com/threerings/media/image/ColorPository.java +++ b/src/java/com/threerings/media/image/ColorPository.java @@ -22,6 +22,7 @@ package com.threerings.media.image; import java.awt.Color; + import java.util.ArrayList; import java.util.Iterator; @@ -36,9 +37,10 @@ import com.samskivert.util.HashIntMap; import com.samskivert.util.RandomUtil; import com.samskivert.util.StringUtil; -import com.threerings.resource.ResourceManager; import com.threerings.util.CompiledConfig; +import com.threerings.resource.ResourceManager; + import static com.threerings.media.Log.log; /** diff --git a/src/java/com/threerings/media/image/ImageDataProvider.java b/src/java/com/threerings/media/image/ImageDataProvider.java index bc9f019b..4eda080f 100644 --- a/src/java/com/threerings/media/image/ImageDataProvider.java +++ b/src/java/com/threerings/media/image/ImageDataProvider.java @@ -21,9 +21,10 @@ package com.threerings.media.image; -import java.io.IOException; import java.awt.image.BufferedImage; +import java.io.IOException; + /** * Provides access to image data for the image with the specified * path. Images loaded from different data providers (which are diff --git a/src/java/com/threerings/media/image/ImageManager.java b/src/java/com/threerings/media/image/ImageManager.java index 0061a4a6..e35aafa7 100644 --- a/src/java/com/threerings/media/image/ImageManager.java +++ b/src/java/com/threerings/media/image/ImageManager.java @@ -2,29 +2,32 @@ package com.threerings.media.image; -import static com.threerings.media.Log.log; - import java.awt.Component; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.Transparency; import java.awt.image.BufferedImage; -import java.io.FileNotFoundException; -import java.io.IOException; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.Map; +import java.io.FileNotFoundException; +import java.io.IOException; + import com.google.common.collect.Maps; import com.samskivert.util.LRUHashMap; import com.samskivert.util.StringUtil; import com.samskivert.util.Throttle; import com.samskivert.util.Tuple; + import com.threerings.resource.ResourceManager; +import static com.threerings.media.Log.log; + /** * Provides a single point of access for image retrieval and caching. This does not include * any tie-in to runtime adjustments to control caching and mirage creation. diff --git a/src/java/com/threerings/media/image/ImageUtil.java b/src/java/com/threerings/media/image/ImageUtil.java index baf9cc43..d7cfbefa 100644 --- a/src/java/com/threerings/media/image/ImageUtil.java +++ b/src/java/com/threerings/media/image/ImageUtil.java @@ -32,7 +32,6 @@ import java.awt.HeadlessException; import java.awt.Rectangle; import java.awt.Shape; import java.awt.Transparency; - import java.awt.image.BufferedImage; import java.awt.image.ColorModel; import java.awt.image.DataBuffer; diff --git a/src/java/com/threerings/media/image/MirageIcon.java b/src/java/com/threerings/media/image/MirageIcon.java index aab09806..9932420e 100644 --- a/src/java/com/threerings/media/image/MirageIcon.java +++ b/src/java/com/threerings/media/image/MirageIcon.java @@ -22,8 +22,8 @@ package com.threerings.media.image; import java.awt.Component; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import javax.swing.Icon; diff --git a/src/java/com/threerings/media/image/tools/DumpColorPository.java b/src/java/com/threerings/media/image/tools/DumpColorPository.java index 7d69393f..947021d3 100644 --- a/src/java/com/threerings/media/image/tools/DumpColorPository.java +++ b/src/java/com/threerings/media/image/tools/DumpColorPository.java @@ -21,9 +21,10 @@ package com.threerings.media.image.tools; +import java.util.Iterator; + import java.io.FileInputStream; import java.io.IOException; -import java.util.Iterator; import com.threerings.media.image.ColorPository; diff --git a/src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java b/src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java index 4510fc2b..a6552e36 100644 --- a/src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java +++ b/src/java/com/threerings/media/image/tools/xml/ColorPositoryParser.java @@ -24,15 +24,17 @@ package com.threerings.media.image.tools.xml; import java.io.Serializable; import org.xml.sax.Attributes; + import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; + import com.samskivert.xml.SetPropertyFieldsRule; -import com.threerings.tools.xml.CompiledConfigParser; - +import com.threerings.media.image.ColorPository; import com.threerings.media.image.ColorPository.ClassRecord; import com.threerings.media.image.ColorPository.ColorRecord; -import com.threerings.media.image.ColorPository; + +import com.threerings.tools.xml.CompiledConfigParser; /** * Parses the XML color repository definition and creates a {@link diff --git a/src/java/com/threerings/media/sound/JavaSoundPlayer.java b/src/java/com/threerings/media/sound/JavaSoundPlayer.java index 53abcc4a..27ad4eba 100644 --- a/src/java/com/threerings/media/sound/JavaSoundPlayer.java +++ b/src/java/com/threerings/media/sound/JavaSoundPlayer.java @@ -21,7 +21,7 @@ package com.threerings.media.sound; -import static com.threerings.media.Log.log; +import java.util.HashMap; import java.io.ByteArrayInputStream; import java.io.File; @@ -29,7 +29,6 @@ import java.io.FileInputStream; import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioInputStream; @@ -51,9 +50,12 @@ import com.samskivert.util.StringUtil; import com.samskivert.swing.RuntimeAdjust; -import com.threerings.media.MediaPrefs; import com.threerings.resource.ResourceManager; +import com.threerings.media.MediaPrefs; + +import static com.threerings.media.Log.log; + /** * Manages the playing of audio files via the Java Sound APIs. */ diff --git a/src/java/com/threerings/media/sound/SoundLoader.java b/src/java/com/threerings/media/sound/SoundLoader.java index edf93277..bb8bf646 100644 --- a/src/java/com/threerings/media/sound/SoundLoader.java +++ b/src/java/com/threerings/media/sound/SoundLoader.java @@ -1,19 +1,21 @@ package com.threerings.media.sound; -import static com.threerings.media.Log.log; +import java.util.Properties; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.Properties; import org.apache.commons.io.IOUtils; import com.samskivert.util.Config; import com.samskivert.util.ConfigUtil; import com.samskivert.util.LRUHashMap; + import com.threerings.resource.ResourceManager; +import static com.threerings.media.Log.log; + /** * Loads sound clips specified by package-based properties files. */ diff --git a/src/java/com/threerings/media/sprite/ButtonSprite.java b/src/java/com/threerings/media/sprite/ButtonSprite.java index 3faa5c82..396b1ea0 100644 --- a/src/java/com/threerings/media/sprite/ButtonSprite.java +++ b/src/java/com/threerings/media/sprite/ButtonSprite.java @@ -24,6 +24,7 @@ package com.threerings.media.sprite; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; + import com.samskivert.swing.Label; import com.samskivert.swing.util.SwingUtil; diff --git a/src/java/com/threerings/media/sprite/OrientableImageSprite.java b/src/java/com/threerings/media/sprite/OrientableImageSprite.java index f4a742bd..a34d598b 100644 --- a/src/java/com/threerings/media/sprite/OrientableImageSprite.java +++ b/src/java/com/threerings/media/sprite/OrientableImageSprite.java @@ -23,12 +23,10 @@ package com.threerings.media.sprite; import java.awt.Graphics2D; import java.awt.Rectangle; - import java.awt.geom.AffineTransform; import java.awt.geom.Area; import com.threerings.media.image.Mirage; - import com.threerings.media.util.MultiFrameImage; /** diff --git a/src/java/com/threerings/media/sprite/Sprite.java b/src/java/com/threerings/media/sprite/Sprite.java index 6b151526..df69c314 100644 --- a/src/java/com/threerings/media/sprite/Sprite.java +++ b/src/java/com/threerings/media/sprite/Sprite.java @@ -26,6 +26,7 @@ import java.awt.Rectangle; import java.awt.Shape; import com.samskivert.util.ObserverList; + import com.threerings.util.DirectionCodes; import com.threerings.media.AbstractMedia; diff --git a/src/java/com/threerings/media/sprite/SpriteManager.java b/src/java/com/threerings/media/sprite/SpriteManager.java index e8218967..4a4417ee 100644 --- a/src/java/com/threerings/media/sprite/SpriteManager.java +++ b/src/java/com/threerings/media/sprite/SpriteManager.java @@ -25,8 +25,8 @@ import java.awt.Graphics2D; import java.awt.Shape; import java.util.Collections; -import java.util.List; import java.util.Iterator; +import java.util.List; import com.samskivert.util.Predicate; import com.samskivert.util.SortableArrayList; diff --git a/src/java/com/threerings/media/tile/IMImageProvider.java b/src/java/com/threerings/media/tile/IMImageProvider.java index 453d0eb6..de7cd845 100644 --- a/src/java/com/threerings/media/tile/IMImageProvider.java +++ b/src/java/com/threerings/media/tile/IMImageProvider.java @@ -24,9 +24,9 @@ package com.threerings.media.tile; import java.awt.Rectangle; import java.awt.image.BufferedImage; -import com.threerings.media.image.ImageManager; import com.threerings.media.image.Colorization; import com.threerings.media.image.ImageDataProvider; +import com.threerings.media.image.ImageManager; import com.threerings.media.image.Mirage; /** diff --git a/src/java/com/threerings/media/tile/ImageProvider.java b/src/java/com/threerings/media/tile/ImageProvider.java index 147f5479..0d2a0c0b 100644 --- a/src/java/com/threerings/media/tile/ImageProvider.java +++ b/src/java/com/threerings/media/tile/ImageProvider.java @@ -24,8 +24,8 @@ package com.threerings.media.tile; import java.awt.Rectangle; import java.awt.image.BufferedImage; -import com.threerings.media.image.Colorization; import com.threerings.media.image.ClientImageManager; +import com.threerings.media.image.Colorization; import com.threerings.media.image.Mirage; /** diff --git a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java b/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java index feb475ae..75168202 100644 --- a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java +++ b/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java @@ -23,9 +23,11 @@ package com.threerings.media.tile; import java.awt.Rectangle; import java.awt.image.BufferedImage; -import java.io.IOException; + import java.util.Map; +import java.io.IOException; + import com.samskivert.util.LRUHashMap; import com.threerings.media.image.BufferedMirage; diff --git a/src/java/com/threerings/media/tile/Tile.java b/src/java/com/threerings/media/tile/Tile.java index ed175ed2..9426b01b 100644 --- a/src/java/com/threerings/media/tile/Tile.java +++ b/src/java/com/threerings/media/tile/Tile.java @@ -22,6 +22,7 @@ package com.threerings.media.tile; import java.awt.Graphics2D; + import java.util.Arrays; import com.threerings.media.image.Colorization; diff --git a/src/java/com/threerings/media/tile/TileIcon.java b/src/java/com/threerings/media/tile/TileIcon.java index 28ff206b..ba91c026 100644 --- a/src/java/com/threerings/media/tile/TileIcon.java +++ b/src/java/com/threerings/media/tile/TileIcon.java @@ -22,8 +22,8 @@ package com.threerings.media.tile; import java.awt.Component; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import javax.swing.Icon; diff --git a/src/java/com/threerings/media/tile/TileManager.java b/src/java/com/threerings/media/tile/TileManager.java index 81f5036f..6184f614 100644 --- a/src/java/com/threerings/media/tile/TileManager.java +++ b/src/java/com/threerings/media/tile/TileManager.java @@ -21,9 +21,8 @@ package com.threerings.media.tile; -import static com.threerings.media.Log.log; - import java.lang.ref.SoftReference; + import java.util.Map; import com.google.common.collect.Maps; @@ -32,6 +31,8 @@ import com.samskivert.io.PersistenceException; import com.threerings.media.image.ImageManager; +import static com.threerings.media.Log.log; + /** * The tile manager provides a simplified interface for retrieving and caching tiles. Tiles can be * loaded in two different ways. An application can load a tileset by hand, specifying the path to diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java index f191cb31..e0ad7b15 100644 --- a/src/java/com/threerings/media/tile/TileSet.java +++ b/src/java/com/threerings/media/tile/TileSet.java @@ -21,22 +21,25 @@ package com.threerings.media.tile; +import java.lang.ref.SoftReference; + import java.awt.Rectangle; import java.awt.image.BufferedImage; -import java.io.Serializable; -import java.lang.ref.SoftReference; + import java.util.Iterator; import java.util.Map; +import java.io.Serializable; + import com.google.common.collect.Maps; import com.samskivert.util.StringUtil; import com.samskivert.util.Throttle; -import com.threerings.media.image.Colorization; -import com.threerings.media.image.Mirage; -import com.threerings.media.image.ImageUtil; import com.threerings.media.image.BufferedMirage; +import com.threerings.media.image.Colorization; +import com.threerings.media.image.ImageUtil; +import com.threerings.media.image.Mirage; import com.threerings.media.tile.Tile.Key; import static com.threerings.media.Log.log; diff --git a/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java b/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java index b540453f..4792fdf7 100644 --- a/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java +++ b/src/java/com/threerings/media/tile/TrimmedObjectTileSet.java @@ -22,6 +22,7 @@ package com.threerings.media.tile; import java.awt.Rectangle; + import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; @@ -29,8 +30,9 @@ import java.io.Serializable; import com.samskivert.util.ListUtil; import com.samskivert.util.StringUtil; -import com.threerings.media.image.Colorization; import com.threerings.resource.FastImageIO; + +import com.threerings.media.image.Colorization; import com.threerings.media.tile.util.TileSetTrimmer; /** diff --git a/src/java/com/threerings/media/tile/TrimmedTileSet.java b/src/java/com/threerings/media/tile/TrimmedTileSet.java index 64ead17a..26ee7d30 100644 --- a/src/java/com/threerings/media/tile/TrimmedTileSet.java +++ b/src/java/com/threerings/media/tile/TrimmedTileSet.java @@ -26,8 +26,9 @@ import java.awt.Rectangle; import java.io.IOException; import java.io.OutputStream; -import com.threerings.media.image.Colorization; import com.threerings.resource.FastImageIO; + +import com.threerings.media.image.Colorization; import com.threerings.media.tile.util.TileSetTrimmer; /** diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java index dac218a6..0dc5f393 100644 --- a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java +++ b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java @@ -23,13 +23,15 @@ package com.threerings.media.tile.bundle; import java.awt.image.BufferedImage; +import java.util.Iterator; + import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; -import java.util.Iterator; import com.samskivert.util.HashIntMap; + import com.threerings.resource.FastImageIO; import com.threerings.resource.ResourceBundle; diff --git a/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java b/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java index 6c3841c2..c98078e1 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java +++ b/src/java/com/threerings/media/tile/bundle/tools/DirectoryTileSetBundlerTask.java @@ -23,6 +23,7 @@ package com.threerings.media.tile.bundle.tools; import java.io.File; import java.io.IOException; + import org.apache.tools.ant.BuildException; /** diff --git a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java index af73e3f1..3df4d37c 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java +++ b/src/java/com/threerings/media/tile/bundle/tools/DumpBundle.java @@ -21,9 +21,10 @@ package com.threerings.media.tile.bundle.tools; -import java.io.File; import java.util.Iterator; +import java.io.File; + import com.threerings.resource.FileResourceBundle; import com.threerings.resource.ResourceBundle; diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java index 00969684..5b028fbe 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java @@ -22,11 +22,7 @@ package com.threerings.media.tile.bundle.tools; import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; + import java.util.ArrayList; import java.util.Iterator; import java.util.jar.JarEntry; @@ -34,14 +30,24 @@ import java.util.jar.JarOutputStream; import java.util.jar.Manifest; import java.util.zip.Deflater; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; + import javax.imageio.ImageIO; +import org.xml.sax.SAXException; + import org.apache.commons.digester.Digester; import org.apache.commons.io.IOUtils; -import org.xml.sax.SAXException; import com.samskivert.io.PersistenceException; import com.samskivert.util.HashIntMap; + +import com.threerings.resource.FastImageIO; + import com.threerings.media.tile.ImageProvider; import com.threerings.media.tile.ObjectTileSet; import com.threerings.media.tile.SimpleCachingImageProvider; @@ -51,7 +57,6 @@ import com.threerings.media.tile.TrimmedObjectTileSet; import com.threerings.media.tile.bundle.BundleUtil; import com.threerings.media.tile.bundle.TileSetBundle; import com.threerings.media.tile.tools.xml.TileSetRuleSet; -import com.threerings.resource.FastImageIO; import static com.threerings.media.Log.log; diff --git a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java index 7a780adc..63d43f78 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundlerTask.java @@ -21,9 +21,10 @@ package com.threerings.media.tile.bundle.tools; +import java.util.ArrayList; + import java.io.File; import java.io.IOException; -import java.util.ArrayList; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/java/com/threerings/media/tile/tools/DumpTileSetMap.java b/src/java/com/threerings/media/tile/tools/DumpTileSetMap.java index 6e7cf6df..5a43eb9e 100644 --- a/src/java/com/threerings/media/tile/tools/DumpTileSetMap.java +++ b/src/java/com/threerings/media/tile/tools/DumpTileSetMap.java @@ -21,9 +21,10 @@ package com.threerings.media.tile.tools; -import java.io.File; import java.util.Iterator; +import java.io.File; + import com.samskivert.io.PersistenceException; /** diff --git a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java b/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java index f99016ee..a98f39ea 100644 --- a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java +++ b/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java @@ -21,6 +21,9 @@ package com.threerings.media.tile.tools; +import java.util.HashMap; +import java.util.Iterator; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -29,9 +32,6 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; - import com.samskivert.io.PersistenceException; import com.samskivert.util.QuickSort; diff --git a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java index 8d1a6527..4faa8e92 100644 --- a/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java +++ b/src/java/com/threerings/media/tile/tools/xml/ObjectTileSetRuleSet.java @@ -26,11 +26,11 @@ import org.apache.commons.digester.Digester; import com.samskivert.util.StringUtil; import com.samskivert.xml.CallMethodSpecialRule; +import com.threerings.util.DirectionUtil; + import com.threerings.media.tile.ObjectTileSet; import com.threerings.media.tile.TileSet; -import com.threerings.util.DirectionUtil; - /** * Parses {@link ObjectTileSet} instances from a tileset description. An * object tileset description looks like so: diff --git a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java b/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java index c166ebbc..68014814 100644 --- a/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java +++ b/src/java/com/threerings/media/tile/tools/xml/TileSetRuleSet.java @@ -25,8 +25,8 @@ import org.apache.commons.digester.Digester; import org.apache.commons.digester.RuleSetBase; import com.samskivert.util.StringUtil; -import com.samskivert.xml.ValidatedSetNextRule.Validator; import com.samskivert.xml.ValidatedSetNextRule; +import com.samskivert.xml.ValidatedSetNextRule.Validator; import com.threerings.media.tile.TileSet; diff --git a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java b/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java index e01a404f..8b4bf32f 100644 --- a/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java +++ b/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParser.java @@ -21,17 +21,19 @@ package com.threerings.media.tile.tools.xml; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; + +import org.xml.sax.SAXException; import org.apache.commons.digester.Digester; -import org.xml.sax.SAXException; import com.samskivert.util.ConfigUtil; import com.samskivert.xml.ValidatedSetNextRule; diff --git a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java index 1546c8f8..3a19cf60 100644 --- a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java +++ b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java @@ -22,17 +22,20 @@ package com.threerings.media.tile.util; import java.awt.Rectangle; -import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.awt.image.Raster; import java.awt.image.RasterFormatException; import java.awt.image.WritableRaster; + import java.io.IOException; import java.io.OutputStream; +import javax.imageio.ImageIO; + +import com.threerings.resource.FastImageIO; + import com.threerings.media.image.ImageUtil; import com.threerings.media.tile.TileSet; -import com.threerings.resource.FastImageIO; /** * Contains routines for trimming the images from an existing tileset diff --git a/src/java/com/threerings/media/timer/CalibratingTimer.java b/src/java/com/threerings/media/timer/CalibratingTimer.java index 2b1cb03e..6fbb686f 100644 --- a/src/java/com/threerings/media/timer/CalibratingTimer.java +++ b/src/java/com/threerings/media/timer/CalibratingTimer.java @@ -21,9 +21,11 @@ package com.threerings.media.timer; -import com.samskivert.swing.RuntimeAdjust; import com.samskivert.util.Interval; import com.samskivert.util.Logger; + +import com.samskivert.swing.RuntimeAdjust; + import com.threerings.media.MediaPrefs; /** diff --git a/src/java/com/threerings/media/tools/RecolorImage.java b/src/java/com/threerings/media/tools/RecolorImage.java index 388d9568..2a4f86c2 100644 --- a/src/java/com/threerings/media/tools/RecolorImage.java +++ b/src/java/com/threerings/media/tools/RecolorImage.java @@ -25,22 +25,22 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Graphics; import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Collections; -import java.util.Comparator; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; import javax.imageio.ImageIO; - import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JButton; diff --git a/src/java/com/threerings/media/tools/ResourceIndexerTask.java b/src/java/com/threerings/media/tools/ResourceIndexerTask.java index f6e55841..bd6028e1 100644 --- a/src/java/com/threerings/media/tools/ResourceIndexerTask.java +++ b/src/java/com/threerings/media/tools/ResourceIndexerTask.java @@ -1,9 +1,10 @@ package com.threerings.media.tools; +import java.util.ArrayList; + import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; diff --git a/src/java/com/threerings/media/util/AStarPathUtil.java b/src/java/com/threerings/media/util/AStarPathUtil.java index 7e5f2d84..1f1ea11d 100644 --- a/src/java/com/threerings/media/util/AStarPathUtil.java +++ b/src/java/com/threerings/media/util/AStarPathUtil.java @@ -22,12 +22,14 @@ package com.threerings.media.util; import java.awt.Point; -import java.util.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; import com.samskivert.util.HashIntMap; -import com.threerings.media.util.MathUtil; - /** * The AStarPathUtil class provides a facility for * finding a reasonable path between two points in a scene using the diff --git a/src/java/com/threerings/media/util/LineSegmentPath.java b/src/java/com/threerings/media/util/LineSegmentPath.java index d8a53a87..c3811b80 100644 --- a/src/java/com/threerings/media/util/LineSegmentPath.java +++ b/src/java/com/threerings/media/util/LineSegmentPath.java @@ -22,8 +22,8 @@ package com.threerings.media.util; import java.awt.Color; -import java.awt.Point; import java.awt.Graphics2D; +import java.awt.Point; import java.util.ArrayList; import java.util.Iterator; @@ -34,8 +34,6 @@ import com.samskivert.util.StringUtil; import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; -import com.threerings.media.util.MathUtil; - import static com.threerings.media.Log.log; /** diff --git a/src/java/com/threerings/media/util/TiledArea.java b/src/java/com/threerings/media/util/TiledArea.java index 0cb67752..2adbbd2b 100644 --- a/src/java/com/threerings/media/util/TiledArea.java +++ b/src/java/com/threerings/media/util/TiledArea.java @@ -24,6 +24,7 @@ package com.threerings.media.util; import java.awt.Dimension; import java.awt.Graphics; import java.awt.image.BufferedImage; + import javax.swing.JComponent; /** diff --git a/src/java/com/threerings/miso/client/DirtyItemList.java b/src/java/com/threerings/miso/client/DirtyItemList.java index a176b36b..f1b70046 100644 --- a/src/java/com/threerings/miso/client/DirtyItemList.java +++ b/src/java/com/threerings/miso/client/DirtyItemList.java @@ -22,6 +22,7 @@ package com.threerings.miso.client; import java.awt.Graphics2D; + import java.util.ArrayList; import java.util.Comparator; diff --git a/src/java/com/threerings/miso/client/MisoScenePanel.java b/src/java/com/threerings/miso/client/MisoScenePanel.java index fe98f80a..73732903 100644 --- a/src/java/com/threerings/miso/client/MisoScenePanel.java +++ b/src/java/com/threerings/miso/client/MisoScenePanel.java @@ -21,7 +21,7 @@ package com.threerings.miso.client; -import static com.threerings.miso.Log.log; +import java.lang.ref.WeakReference; import java.awt.AlphaComposite; import java.awt.BasicStroke; @@ -42,7 +42,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.lang.ref.WeakReference; + import java.util.Iterator; import java.util.List; import java.util.Map; @@ -73,6 +73,7 @@ import com.threerings.media.tile.TileSet; import com.threerings.media.util.AStarPathUtil; import com.threerings.media.util.MathUtil; import com.threerings.media.util.Path; + import com.threerings.miso.MisoPrefs; import com.threerings.miso.client.DirtyItemList.DirtyItem; import com.threerings.miso.data.MisoSceneModel; @@ -83,6 +84,8 @@ import com.threerings.miso.util.MisoContext; import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoUtil; +import static com.threerings.miso.Log.log; + /** * Renders a Miso scene for all to see. */ diff --git a/src/java/com/threerings/miso/client/ObjectActionHandler.java b/src/java/com/threerings/miso/client/ObjectActionHandler.java index ed66aefc..a20ef8fa 100644 --- a/src/java/com/threerings/miso/client/ObjectActionHandler.java +++ b/src/java/com/threerings/miso/client/ObjectActionHandler.java @@ -22,13 +22,14 @@ package com.threerings.miso.client; import java.awt.event.ActionEvent; + import java.util.HashMap; + import javax.swing.Icon; -import com.samskivert.swing.RadialMenu; import com.samskivert.util.StringUtil; -import com.threerings.miso.client.SceneObject; +import com.samskivert.swing.RadialMenu; import static com.threerings.miso.Log.log; diff --git a/src/java/com/threerings/miso/client/ResolutionView.java b/src/java/com/threerings/miso/client/ResolutionView.java index 9e1fc342..85da1c8b 100644 --- a/src/java/com/threerings/miso/client/ResolutionView.java +++ b/src/java/com/threerings/miso/client/ResolutionView.java @@ -23,19 +23,21 @@ package com.threerings.miso.client; import java.awt.Color; import java.awt.Dimension; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Polygon; import java.awt.Rectangle; import java.awt.geom.AffineTransform; -import javax.swing.JPanel; import java.util.HashMap; import java.util.Iterator; +import javax.swing.JPanel; + import com.samskivert.util.IntTuple; import com.threerings.media.util.MathUtil; + import com.threerings.miso.util.MisoSceneMetrics; import com.threerings.miso.util.MisoUtil; diff --git a/src/java/com/threerings/miso/client/RethinkOp.java b/src/java/com/threerings/miso/client/RethinkOp.java index 361de55f..4c2caa6a 100644 --- a/src/java/com/threerings/miso/client/RethinkOp.java +++ b/src/java/com/threerings/miso/client/RethinkOp.java @@ -2,11 +2,13 @@ package com.threerings.miso.client; import java.awt.Point; import java.awt.Rectangle; + import java.util.Set; import com.google.common.collect.Sets; import com.threerings.media.util.MathUtil; + import com.threerings.miso.util.MisoSceneMetrics; /** diff --git a/src/java/com/threerings/miso/client/SceneBlock.java b/src/java/com/threerings/miso/client/SceneBlock.java index 4da5e0e5..907ae2c4 100644 --- a/src/java/com/threerings/miso/client/SceneBlock.java +++ b/src/java/com/threerings/miso/client/SceneBlock.java @@ -23,6 +23,7 @@ package com.threerings.miso.client; import java.awt.Polygon; import java.awt.Rectangle; + import java.util.ArrayList; import java.util.Arrays; import java.util.Map; @@ -32,7 +33,6 @@ import com.samskivert.util.ArrayUtil; import com.samskivert.util.IntMap; import com.samskivert.util.StringUtil; -import com.threerings.geom.GeomUtil; import com.threerings.media.tile.NoSuchTileSetException; import com.threerings.media.tile.ObjectTile; import com.threerings.media.tile.Tile; @@ -40,6 +40,9 @@ import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileUtil; import com.threerings.media.util.MathUtil; + +import com.threerings.geom.GeomUtil; + import com.threerings.miso.data.MisoSceneModel; import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.tile.BaseTile; diff --git a/src/java/com/threerings/miso/client/SceneObject.java b/src/java/com/threerings/miso/client/SceneObject.java index 20074dae..af8da9cb 100644 --- a/src/java/com/threerings/miso/client/SceneObject.java +++ b/src/java/com/threerings/miso/client/SceneObject.java @@ -38,6 +38,7 @@ import com.threerings.media.tile.ObjectTile; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileUtil; import com.threerings.media.tile.TileSet.Colorizer; + import com.threerings.miso.MisoPrefs; import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.util.MisoSceneMetrics; diff --git a/src/java/com/threerings/miso/client/SceneObjectIndicator.java b/src/java/com/threerings/miso/client/SceneObjectIndicator.java index 522e5381..286d3de1 100644 --- a/src/java/com/threerings/miso/client/SceneObjectIndicator.java +++ b/src/java/com/threerings/miso/client/SceneObjectIndicator.java @@ -2,6 +2,7 @@ package com.threerings.miso.client; import java.awt.Graphics2D; import java.awt.Rectangle; + import java.util.Collection; import javax.swing.Icon; diff --git a/src/java/com/threerings/miso/client/SceneObjectTip.java b/src/java/com/threerings/miso/client/SceneObjectTip.java index 1a69749c..78fbbfe5 100644 --- a/src/java/com/threerings/miso/client/SceneObjectTip.java +++ b/src/java/com/threerings/miso/client/SceneObjectTip.java @@ -29,14 +29,16 @@ import java.awt.Graphics2D; import java.awt.Rectangle; import java.util.Collection; + import javax.swing.Icon; import javax.swing.UIManager; -import com.samskivert.swing.Label; -import com.samskivert.swing.LabelSausage; import com.samskivert.util.ComparableArrayList; import com.samskivert.util.StringUtil; +import com.samskivert.swing.Label; +import com.samskivert.swing.LabelSausage; + /** * A lightweight tooltip used by the {@link MisoScenePanel}. The tip * foreground and background are controlled by the following {@link diff --git a/src/java/com/threerings/miso/client/TilePath.java b/src/java/com/threerings/miso/client/TilePath.java index fe1b7e7f..c57a1974 100644 --- a/src/java/com/threerings/miso/client/TilePath.java +++ b/src/java/com/threerings/miso/client/TilePath.java @@ -22,6 +22,7 @@ package com.threerings.miso.client; import java.awt.Point; + import java.util.List; import com.threerings.util.DirectionCodes; diff --git a/src/java/com/threerings/miso/data/MisoSceneModel.java b/src/java/com/threerings/miso/data/MisoSceneModel.java index d159e0ac..053de9d7 100644 --- a/src/java/com/threerings/miso/data/MisoSceneModel.java +++ b/src/java/com/threerings/miso/data/MisoSceneModel.java @@ -24,6 +24,7 @@ package com.threerings.miso.data; import java.awt.Rectangle; import com.threerings.io.SimpleStreamableObject; + import com.threerings.miso.util.ObjectSet; /** diff --git a/src/java/com/threerings/miso/data/ObjectInfo.java b/src/java/com/threerings/miso/data/ObjectInfo.java index de46b2cf..0afaafdf 100644 --- a/src/java/com/threerings/miso/data/ObjectInfo.java +++ b/src/java/com/threerings/miso/data/ObjectInfo.java @@ -24,6 +24,7 @@ package com.threerings.miso.data; import com.samskivert.util.StringUtil; import com.threerings.io.SimpleStreamableObject; + import com.threerings.media.tile.TileUtil; /** diff --git a/src/java/com/threerings/miso/data/SimpleMisoSceneModel.java b/src/java/com/threerings/miso/data/SimpleMisoSceneModel.java index 138f8a26..dc566642 100644 --- a/src/java/com/threerings/miso/data/SimpleMisoSceneModel.java +++ b/src/java/com/threerings/miso/data/SimpleMisoSceneModel.java @@ -22,6 +22,7 @@ package com.threerings.miso.data; import java.awt.Rectangle; + import java.util.List; import com.samskivert.util.ArrayUtil; @@ -29,6 +30,7 @@ import com.samskivert.util.IntListUtil; import com.samskivert.util.ListUtil; import com.threerings.media.util.MathUtil; + import com.threerings.miso.util.ObjectSet; /** diff --git a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java index 56b06b31..24769534 100644 --- a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java +++ b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java @@ -22,6 +22,7 @@ package com.threerings.miso.data; import java.awt.Rectangle; + import java.util.ArrayList; import java.util.Iterator; @@ -31,9 +32,10 @@ import com.samskivert.util.StringUtil; import com.threerings.io.SimpleStreamableObject; -import com.threerings.media.util.MathUtil; import com.threerings.util.StreamableHashIntMap; +import com.threerings.media.util.MathUtil; + import com.threerings.miso.util.ObjectSet; import static com.threerings.miso.Log.log; diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/java/com/threerings/miso/tile/AutoFringer.java index fe1e8eb5..1b720c27 100644 --- a/src/java/com/threerings/miso/tile/AutoFringer.java +++ b/src/java/com/threerings/miso/tile/AutoFringer.java @@ -21,16 +21,17 @@ package com.threerings.miso.tile; -import static com.threerings.miso.Log.log; +import java.lang.ref.WeakReference; import java.awt.Graphics2D; import java.awt.Transparency; import java.awt.image.BufferedImage; -import java.lang.ref.WeakReference; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; + import com.google.common.collect.Lists; import com.samskivert.util.CheapIntMap; @@ -44,8 +45,11 @@ import com.threerings.media.tile.Tile; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileSet; import com.threerings.media.tile.TileUtil; + import com.threerings.miso.data.MisoSceneModel; +import static com.threerings.miso.Log.log; + /** * Automatically fringes a scene according to the rules in the supplied fringe configuration. */ diff --git a/src/java/com/threerings/miso/tile/FringeConfiguration.java b/src/java/com/threerings/miso/tile/FringeConfiguration.java index 425e4039..2654682a 100644 --- a/src/java/com/threerings/miso/tile/FringeConfiguration.java +++ b/src/java/com/threerings/miso/tile/FringeConfiguration.java @@ -21,9 +21,10 @@ package com.threerings.miso.tile; -import java.io.Serializable; import java.util.ArrayList; +import java.io.Serializable; + import com.samskivert.util.HashIntMap; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/miso/tile/MisoTileManager.java b/src/java/com/threerings/miso/tile/MisoTileManager.java index 7409faae..4cc1fd92 100644 --- a/src/java/com/threerings/miso/tile/MisoTileManager.java +++ b/src/java/com/threerings/miso/tile/MisoTileManager.java @@ -26,9 +26,10 @@ import java.io.InputStream; import com.samskivert.io.StreamUtil; -import com.threerings.resource.ResourceManager; import com.threerings.util.CompiledConfig; +import com.threerings.resource.ResourceManager; + import com.threerings.media.image.ImageManager; import com.threerings.media.tile.TileManager; diff --git a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java b/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java index 3b9d67ce..7216800f 100644 --- a/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java +++ b/src/java/com/threerings/miso/tile/tools/xml/FringeConfigurationParser.java @@ -24,19 +24,20 @@ package com.threerings.miso.tile.tools.xml; import java.io.Serializable; import org.xml.sax.Attributes; + import org.apache.commons.digester.Digester; import com.samskivert.util.StringUtil; import com.samskivert.xml.SetPropertyFieldsRule; import com.samskivert.xml.ValidatedSetNextRule; -import com.threerings.tools.xml.CompiledConfigParser; - import com.threerings.media.tile.TileSetIDBroker; +import com.threerings.miso.tile.FringeConfiguration; import com.threerings.miso.tile.FringeConfiguration.FringeRecord; import com.threerings.miso.tile.FringeConfiguration.FringeTileSetRecord; -import com.threerings.miso.tile.FringeConfiguration; + +import com.threerings.tools.xml.CompiledConfigParser; import static com.threerings.miso.Log.log; diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java index 02c5d73c..12e13661 100644 --- a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java +++ b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneParser.java @@ -21,10 +21,11 @@ package com.threerings.miso.tools.xml; -import java.io.IOException; import java.io.FileInputStream; +import java.io.IOException; import org.xml.sax.SAXException; + import org.apache.commons.digester.Digester; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java index 5ebe37be..64fd4ca0 100644 --- a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java +++ b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneRuleSet.java @@ -22,6 +22,7 @@ package com.threerings.miso.tools.xml; import java.util.ArrayList; + import org.xml.sax.Attributes; import org.apache.commons.digester.Digester; @@ -31,11 +32,11 @@ import com.samskivert.xml.CallMethodSpecialRule; import com.samskivert.xml.SetFieldRule; import com.samskivert.xml.SetPropertyFieldsRule; -import com.threerings.tools.xml.NestableRuleSet; - import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.data.SimpleMisoSceneModel; +import com.threerings.tools.xml.NestableRuleSet; + /** * Used to parse a {@link SimpleMisoSceneModel} from XML. */ diff --git a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java index 60d5cfd5..cedc9600 100644 --- a/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java +++ b/src/java/com/threerings/miso/tools/xml/SimpleMisoSceneWriter.java @@ -25,12 +25,14 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; + import com.samskivert.util.StringUtil; -import com.threerings.tools.xml.NestableWriter; import com.threerings.miso.data.ObjectInfo; import com.threerings.miso.data.SimpleMisoSceneModel; +import com.threerings.tools.xml.NestableWriter; + /** * Generates an XML representation of a {@link SimpleMisoSceneModel}. */ diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java index 19f84979..6bfa87fe 100644 --- a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java +++ b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneParser.java @@ -21,10 +21,11 @@ package com.threerings.miso.tools.xml; -import java.io.IOException; import java.io.FileInputStream; +import java.io.IOException; import org.xml.sax.SAXException; + import org.apache.commons.digester.Digester; import com.samskivert.io.StreamUtil; diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java index 32d33c9c..4a58696f 100644 --- a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java +++ b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneRuleSet.java @@ -29,11 +29,11 @@ import org.apache.commons.digester.Rule; import com.samskivert.xml.SetFieldRule; import com.samskivert.xml.SetPropertyFieldsRule; -import com.threerings.tools.xml.NestableRuleSet; - import com.threerings.miso.data.ObjectInfo; -import com.threerings.miso.data.SparseMisoSceneModel.Section; import com.threerings.miso.data.SparseMisoSceneModel; +import com.threerings.miso.data.SparseMisoSceneModel.Section; + +import com.threerings.tools.xml.NestableRuleSet; /** * Used to parse a {@link SparseMisoSceneModel} from XML. diff --git a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java index eb31e8cc..d382bb8e 100644 --- a/src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java +++ b/src/java/com/threerings/miso/tools/xml/SparseMisoSceneWriter.java @@ -27,12 +27,14 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; import com.megginson.sax.DataWriter; + import com.samskivert.util.StringUtil; -import com.threerings.tools.xml.NestableWriter; import com.threerings.miso.data.ObjectInfo; -import com.threerings.miso.data.SparseMisoSceneModel.Section; import com.threerings.miso.data.SparseMisoSceneModel; +import com.threerings.miso.data.SparseMisoSceneModel.Section; + +import com.threerings.tools.xml.NestableWriter; /** * Generates an XML representation of a {@link SparseMisoSceneModel}. diff --git a/src/java/com/threerings/miso/util/MisoContext.java b/src/java/com/threerings/miso/util/MisoContext.java index e3cd3b58..380d9450 100644 --- a/src/java/com/threerings/miso/util/MisoContext.java +++ b/src/java/com/threerings/miso/util/MisoContext.java @@ -22,6 +22,7 @@ package com.threerings.miso.util; import com.threerings.media.FrameManager; + import com.threerings.miso.tile.MisoTileManager; /** diff --git a/src/java/com/threerings/openal/FileStream.java b/src/java/com/threerings/openal/FileStream.java index 44f81440..19675c38 100644 --- a/src/java/com/threerings/openal/FileStream.java +++ b/src/java/com/threerings/openal/FileStream.java @@ -21,13 +21,13 @@ package com.threerings.openal; +import java.util.ArrayList; + import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.ArrayList; - /** * An audio stream read from one or more files. */ diff --git a/src/java/com/threerings/openal/Mp3StreamDecoder.java b/src/java/com/threerings/openal/Mp3StreamDecoder.java index 8623a020..4266ca9c 100644 --- a/src/java/com/threerings/openal/Mp3StreamDecoder.java +++ b/src/java/com/threerings/openal/Mp3StreamDecoder.java @@ -23,17 +23,18 @@ package com.threerings.openal; import java.io.IOException; import java.io.InputStream; + import java.nio.ByteBuffer; import java.nio.ShortBuffer; -import org.lwjgl.openal.AL10; - import javazoom.jl.decoder.Bitstream; import javazoom.jl.decoder.Decoder; import javazoom.jl.decoder.Header; import javazoom.jl.decoder.JavaLayerException; import javazoom.jl.decoder.SampleBuffer; +import org.lwjgl.openal.AL10; + /** * Decodes MP3 streams. */ diff --git a/src/java/com/threerings/openal/OpenALSoundPlayer.java b/src/java/com/threerings/openal/OpenALSoundPlayer.java index e2ef5e9c..8f104c88 100644 --- a/src/java/com/threerings/openal/OpenALSoundPlayer.java +++ b/src/java/com/threerings/openal/OpenALSoundPlayer.java @@ -3,14 +3,14 @@ package com.threerings.openal; -import static com.threerings.media.Log.log; +import java.util.Map; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; + import java.nio.ByteBuffer; -import java.util.Map; import javax.sound.sampled.AudioFileFormat; import javax.sound.sampled.AudioFormat; @@ -34,6 +34,8 @@ import com.threerings.media.sound.SoundLoader; import com.threerings.media.sound.SoundPlayer; import com.threerings.media.timer.MediaTimer; +import static com.threerings.media.Log.log; + /** * Implements the abstract pieces of {@link SoundPlayer} via OpenAL. */ diff --git a/src/java/com/threerings/openal/SoundManager.java b/src/java/com/threerings/openal/SoundManager.java index 9d3a25ab..1e430ebb 100644 --- a/src/java/com/threerings/openal/SoundManager.java +++ b/src/java/com/threerings/openal/SoundManager.java @@ -21,13 +21,11 @@ package com.threerings.openal; -import static com.threerings.openal.Log.log; - -import java.nio.IntBuffer; - import java.util.ArrayList; import java.util.HashMap; +import java.nio.IntBuffer; + import org.lwjgl.BufferUtils; import org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; @@ -41,6 +39,8 @@ import com.samskivert.util.RunQueue; import com.threerings.openal.ClipBuffer.Observer; +import static com.threerings.openal.Log.log; + /** * An interface to the OpenAL library that provides a number of additional services: * diff --git a/src/java/com/threerings/openal/Source.java b/src/java/com/threerings/openal/Source.java index 4a171379..268d9b86 100644 --- a/src/java/com/threerings/openal/Source.java +++ b/src/java/com/threerings/openal/Source.java @@ -21,10 +21,10 @@ package com.threerings.openal; -import java.nio.IntBuffer; - import java.util.ArrayList; +import java.nio.IntBuffer; + import org.lwjgl.BufferUtils; import org.lwjgl.openal.AL10; diff --git a/src/java/com/threerings/resource/FastImageIO.java b/src/java/com/threerings/resource/FastImageIO.java index 34b2ed04..e7eddd27 100644 --- a/src/java/com/threerings/resource/FastImageIO.java +++ b/src/java/com/threerings/resource/FastImageIO.java @@ -22,7 +22,6 @@ package com.threerings.resource; import java.awt.Point; - import java.awt.image.BufferedImage; import java.awt.image.DataBuffer; import java.awt.image.DataBufferByte; diff --git a/src/java/com/threerings/resource/FileResourceBundle.java b/src/java/com/threerings/resource/FileResourceBundle.java index 32296484..6859174f 100644 --- a/src/java/com/threerings/resource/FileResourceBundle.java +++ b/src/java/com/threerings/resource/FileResourceBundle.java @@ -23,6 +23,9 @@ package com.threerings.resource; import java.awt.image.BufferedImage; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; @@ -30,14 +33,11 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; +import org.apache.commons.io.IOUtils; import com.samskivert.util.FileUtil; import com.samskivert.util.StringUtil; -import org.apache.commons.io.IOUtils; - import static com.threerings.resource.Log.log; /** diff --git a/src/java/com/threerings/resource/Handler.java b/src/java/com/threerings/resource/Handler.java index 03572267..4b0723a8 100644 --- a/src/java/com/threerings/resource/Handler.java +++ b/src/java/com/threerings/resource/Handler.java @@ -21,6 +21,11 @@ package com.threerings.resource; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.security.Permission; + import java.awt.Rectangle; import java.awt.image.BufferedImage; @@ -28,13 +33,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLStreamHandler; - -import java.security.Permission; - import javax.imageio.ImageIO; + import com.samskivert.io.ByteArrayOutInputStream; import com.samskivert.net.AttachableURLFactory; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/resource/NetworkResourceBundle.java b/src/java/com/threerings/resource/NetworkResourceBundle.java index 206b2cec..e7a68b63 100644 --- a/src/java/com/threerings/resource/NetworkResourceBundle.java +++ b/src/java/com/threerings/resource/NetworkResourceBundle.java @@ -21,15 +21,18 @@ package com.threerings.resource; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.security.AccessControlException; + +import java.awt.image.BufferedImage; + import java.util.HashSet; +import java.io.IOException; +import java.io.InputStream; + import static com.threerings.resource.Log.log; /** diff --git a/src/java/com/threerings/resource/ResourceBundle.java b/src/java/com/threerings/resource/ResourceBundle.java index 51253b21..0ea71764 100644 --- a/src/java/com/threerings/resource/ResourceBundle.java +++ b/src/java/com/threerings/resource/ResourceBundle.java @@ -21,11 +21,11 @@ package com.threerings.resource; +import java.awt.image.BufferedImage; + import java.io.IOException; import java.io.InputStream; -import java.awt.image.BufferedImage; - /** * A resource bundle provides access to media resources. */ diff --git a/src/java/com/threerings/resource/ResourceManager.java b/src/java/com/threerings/resource/ResourceManager.java index 8b9643fe..c9d6cbd9 100644 --- a/src/java/com/threerings/resource/ResourceManager.java +++ b/src/java/com/threerings/resource/ResourceManager.java @@ -21,15 +21,12 @@ package com.threerings.resource; +import java.security.AccessController; +import java.security.PrivilegedAction; + import java.awt.EventQueue; import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; - import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -42,8 +39,11 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.security.AccessController; -import java.security.PrivilegedAction; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; import javax.imageio.ImageIO; import javax.imageio.stream.ImageInputStream; diff --git a/src/java/com/threerings/tools/CompiledConfigTask.java b/src/java/com/threerings/tools/CompiledConfigTask.java index b1925d2d..0e77495a 100644 --- a/src/java/com/threerings/tools/CompiledConfigTask.java +++ b/src/java/com/threerings/tools/CompiledConfigTask.java @@ -21,9 +21,11 @@ package com.threerings.tools; +import java.util.ArrayList; + import java.io.File; import java.io.Serializable; -import java.util.ArrayList; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; @@ -31,9 +33,10 @@ import org.apache.tools.ant.types.FileSet; import com.samskivert.util.FileUtil; -import com.threerings.tools.xml.CompiledConfigParser; import com.threerings.util.CompiledConfig; +import com.threerings.tools.xml.CompiledConfigParser; + /** * Used to parse configuration information from an XML file and create the * serialized representation that is used by the client and server. diff --git a/src/java/com/threerings/tools/xml/CompiledConfigParser.java b/src/java/com/threerings/tools/xml/CompiledConfigParser.java index b993ee36..7e4c0b7d 100644 --- a/src/java/com/threerings/tools/xml/CompiledConfigParser.java +++ b/src/java/com/threerings/tools/xml/CompiledConfigParser.java @@ -27,11 +27,13 @@ import java.io.IOException; import java.io.Serializable; import org.xml.sax.SAXException; + import org.apache.commons.digester.Digester; -import com.threerings.tools.CompiledConfigTask; import com.threerings.util.CompiledConfig; +import com.threerings.tools.CompiledConfigTask; + /** * An abstract base implementation of a parser that is used to compile * configuration definitions into config objects for use by the client and diff --git a/src/java/com/threerings/tools/xml/NestableWriter.java b/src/java/com/threerings/tools/xml/NestableWriter.java index 11d886c8..e5732fb9 100644 --- a/src/java/com/threerings/tools/xml/NestableWriter.java +++ b/src/java/com/threerings/tools/xml/NestableWriter.java @@ -22,6 +22,7 @@ package com.threerings.tools.xml; import org.xml.sax.SAXException; + import com.megginson.sax.DataWriter; /** diff --git a/src/java/com/threerings/util/KeyDispatcher.java b/src/java/com/threerings/util/KeyDispatcher.java index 61edaf0d..00d476a3 100644 --- a/src/java/com/threerings/util/KeyDispatcher.java +++ b/src/java/com/threerings/util/KeyDispatcher.java @@ -22,10 +22,9 @@ package com.threerings.util; import java.awt.Component; -import java.awt.Window; import java.awt.KeyEventDispatcher; import java.awt.KeyboardFocusManager; - +import java.awt.Window; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.WindowEvent; diff --git a/src/java/com/threerings/util/KeyboardManager.java b/src/java/com/threerings/util/KeyboardManager.java index efc2fe0a..f8d6e465 100644 --- a/src/java/com/threerings/util/KeyboardManager.java +++ b/src/java/com/threerings/util/KeyboardManager.java @@ -21,14 +21,13 @@ package com.threerings.util; -import static com.threerings.NenyaLog.log; - import java.awt.KeyEventDispatcher; import java.awt.KeyboardFocusManager; import java.awt.Window; import java.awt.event.KeyEvent; import java.awt.event.WindowEvent; import java.awt.event.WindowFocusListener; + import java.util.HashMap; import java.util.Iterator; @@ -37,15 +36,20 @@ import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; -import com.samskivert.swing.Controller; -import com.samskivert.swing.RuntimeAdjust; import com.samskivert.util.HashIntMap; import com.samskivert.util.Interval; import com.samskivert.util.ObserverList; import com.samskivert.util.RunAnywhere; -import com.threerings.media.MediaPrefs; + +import com.samskivert.swing.Controller; +import com.samskivert.swing.RuntimeAdjust; + import com.threerings.util.keybd.Keyboard; +import com.threerings.media.MediaPrefs; + +import static com.threerings.NenyaLog.log; + /** * The keyboard manager observes keyboard actions on a particular component and posts commands * associated with the key presses to the {@link Controller} hierarchy. It allows specifying the