From 1daf5c206b0086b1e2bb161c50f16709e32d70ab Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Fri, 26 Sep 2008 17:35:27 +0000 Subject: [PATCH] And of course, if I were thinking this morning, I would've rerun the organize imports thing before committing instead of just going "oh yeah, I've been having this stuff sitting around uncommitted for a while waiting on it to be blessed" and missing out on things that'd changed in the meantime. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@665 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../threerings/cast/CharacterDescriptor.java | 4 ++-- .../cast/CompositedMultiFrameImage.java | 6 +++--- .../bundle/BundledComponentRepository.java | 8 ++++---- .../bundle/tools/ComponentBundlerTask.java | 8 -------- .../threerings/media/AbstractMediaManager.java | 6 +++--- .../threerings/media/ActiveRepaintManager.java | 3 --- .../com/threerings/media/MediaOverlay.java | 4 ++-- src/java/com/threerings/media/MediaPanel.java | 2 -- .../com/threerings/media/MetaMediaManager.java | 6 +++--- .../com/threerings/media/RegionManager.java | 4 ++-- .../threerings/media/VirtualMediaPanel.java | 4 ++-- .../media/image/ImageDataProvider.java | 4 ++-- .../threerings/media/image/ImageManager.java | 12 ++++++------ .../threerings/media/sprite/SpriteManager.java | 6 +++--- .../media/tile/SimpleCachingImageProvider.java | 6 +++--- .../com/threerings/media/tile/TileSet.java | 6 +++--- .../threerings/media/tile/TrimmedTileSet.java | 4 ++-- .../media/tile/bundle/TileSetBundle.java | 2 -- .../tile/bundle/tools/TileSetBundler.java | 4 ++-- .../media/tile/util/TileSetTrimmer.java | 6 +++--- .../threerings/media/tools/RecolorImage.java | 18 +++++++++--------- .../threerings/media/util/AStarPathUtil.java | 5 ----- .../threerings/media/util/LineSegmentPath.java | 8 ++++---- .../threerings/miso/client/MisoScenePanel.java | 12 ++++++------ .../miso/client/ObjectActionHandler.java | 4 ++-- .../com/threerings/miso/client/RethinkOp.java | 4 ++-- .../miso/client/SceneObjectIndicator.java | 4 ++-- .../threerings/miso/client/SceneObjectTip.java | 1 - .../com/threerings/miso/tile/AutoFringer.java | 8 ++++---- .../com/threerings/resource/FastImageIO.java | 16 ++++++++-------- .../resource/FileResourceBundle.java | 4 ++-- src/java/com/threerings/resource/Handler.java | 6 +++--- .../resource/NetworkResourceBundle.java | 4 ++-- .../threerings/resource/ResourceBundle.java | 4 ++-- .../threerings/resource/ResourceManager.java | 6 +++--- .../com/threerings/util/KeyboardManager.java | 6 +++--- 36 files changed, 97 insertions(+), 118 deletions(-) diff --git a/src/java/com/threerings/cast/CharacterDescriptor.java b/src/java/com/threerings/cast/CharacterDescriptor.java index 2b7916b1..9e7c42de 100644 --- a/src/java/com/threerings/cast/CharacterDescriptor.java +++ b/src/java/com/threerings/cast/CharacterDescriptor.java @@ -21,10 +21,10 @@ package com.threerings.cast; -import java.awt.Point; - import java.util.Arrays; +import java.awt.Point; + import com.samskivert.util.StringUtil; import com.threerings.media.image.Colorization; diff --git a/src/java/com/threerings/cast/CompositedMultiFrameImage.java b/src/java/com/threerings/cast/CompositedMultiFrameImage.java index b1950843..2a1a4752 100644 --- a/src/java/com/threerings/cast/CompositedMultiFrameImage.java +++ b/src/java/com/threerings/cast/CompositedMultiFrameImage.java @@ -21,15 +21,15 @@ package com.threerings.cast; +import java.util.Arrays; +import java.util.Comparator; + import java.awt.Graphics2D; 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.media.image.ImageManager; import com.threerings.media.image.Mirage; import com.threerings.media.image.VolatileMirage; diff --git a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java index f5cc0c0c..ee956387 100644 --- a/src/java/com/threerings/cast/bundle/BundledComponentRepository.java +++ b/src/java/com/threerings/cast/bundle/BundledComponentRepository.java @@ -21,10 +21,6 @@ package com.threerings.cast.bundle; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; - import java.util.ArrayList; import java.util.Iterator; import java.util.Map; @@ -32,6 +28,10 @@ import java.util.Set; import java.io.IOException; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; + import com.google.common.collect.Maps; import com.samskivert.util.IntIntMap; diff --git a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java index a2d23a2e..c559bf76 100644 --- a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java +++ b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java @@ -21,14 +21,6 @@ package com.threerings.cast.bundle.tools; -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.util.ArrayList; import java.util.HashMap; import java.util.Iterator; diff --git a/src/java/com/threerings/media/AbstractMediaManager.java b/src/java/com/threerings/media/AbstractMediaManager.java index c3e0a901..7dfad4e4 100644 --- a/src/java/com/threerings/media/AbstractMediaManager.java +++ b/src/java/com/threerings/media/AbstractMediaManager.java @@ -21,13 +21,13 @@ package com.threerings.media; +import java.util.Comparator; +import java.util.List; + 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; diff --git a/src/java/com/threerings/media/ActiveRepaintManager.java b/src/java/com/threerings/media/ActiveRepaintManager.java index ca744428..9abf0b50 100644 --- a/src/java/com/threerings/media/ActiveRepaintManager.java +++ b/src/java/com/threerings/media/ActiveRepaintManager.java @@ -33,9 +33,6 @@ 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; diff --git a/src/java/com/threerings/media/MediaOverlay.java b/src/java/com/threerings/media/MediaOverlay.java index ea22e754..e49bc7bb 100644 --- a/src/java/com/threerings/media/MediaOverlay.java +++ b/src/java/com/threerings/media/MediaOverlay.java @@ -21,11 +21,11 @@ package com.threerings.media; +import java.util.List; + import java.awt.Graphics2D; import java.awt.Rectangle; -import java.util.List; - import javax.swing.JRootPane; import com.threerings.media.animation.Animation; diff --git a/src/java/com/threerings/media/MediaPanel.java b/src/java/com/threerings/media/MediaPanel.java index 80809f41..1525bff1 100644 --- a/src/java/com/threerings/media/MediaPanel.java +++ b/src/java/com/threerings/media/MediaPanel.java @@ -32,8 +32,6 @@ 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; diff --git a/src/java/com/threerings/media/MetaMediaManager.java b/src/java/com/threerings/media/MetaMediaManager.java index 62c7710a..3b4677a0 100644 --- a/src/java/com/threerings/media/MetaMediaManager.java +++ b/src/java/com/threerings/media/MetaMediaManager.java @@ -21,15 +21,15 @@ package com.threerings.media; +import java.util.Arrays; +import java.util.Iterator; + 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; - import com.google.common.collect.Iterators; import com.samskivert.util.IntListUtil; diff --git a/src/java/com/threerings/media/RegionManager.java b/src/java/com/threerings/media/RegionManager.java index 093bf9d8..e324399a 100644 --- a/src/java/com/threerings/media/RegionManager.java +++ b/src/java/com/threerings/media/RegionManager.java @@ -21,11 +21,11 @@ package com.threerings.media; +import java.util.List; + import java.awt.EventQueue; import java.awt.Rectangle; -import java.util.List; - import com.google.common.collect.Lists; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/media/VirtualMediaPanel.java b/src/java/com/threerings/media/VirtualMediaPanel.java index 0b1ee00f..0c93cc1a 100644 --- a/src/java/com/threerings/media/VirtualMediaPanel.java +++ b/src/java/com/threerings/media/VirtualMediaPanel.java @@ -21,14 +21,14 @@ package com.threerings.media; +import java.util.ArrayList; + 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; import com.samskivert.util.RunAnywhere; diff --git a/src/java/com/threerings/media/image/ImageDataProvider.java b/src/java/com/threerings/media/image/ImageDataProvider.java index c1a86bd0..24301a67 100644 --- a/src/java/com/threerings/media/image/ImageDataProvider.java +++ b/src/java/com/threerings/media/image/ImageDataProvider.java @@ -22,10 +22,10 @@ package com.threerings.media.image; -import java.awt.image.BufferedImage; - import java.io.IOException; +import java.awt.image.BufferedImage; + /** * 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 e35aafa7..4601754f 100644 --- a/src/java/com/threerings/media/image/ImageManager.java +++ b/src/java/com/threerings/media/image/ImageManager.java @@ -2,12 +2,6 @@ package com.threerings.media.image; -import java.awt.Component; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.Transparency; -import java.awt.image.BufferedImage; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -17,6 +11,12 @@ import java.util.Map; import java.io.FileNotFoundException; import java.io.IOException; +import java.awt.Component; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Transparency; +import java.awt.image.BufferedImage; + import com.google.common.collect.Maps; import com.samskivert.util.LRUHashMap; diff --git a/src/java/com/threerings/media/sprite/SpriteManager.java b/src/java/com/threerings/media/sprite/SpriteManager.java index 4a4417ee..dfb9f5b0 100644 --- a/src/java/com/threerings/media/sprite/SpriteManager.java +++ b/src/java/com/threerings/media/sprite/SpriteManager.java @@ -21,13 +21,13 @@ package com.threerings.media.sprite; -import java.awt.Graphics2D; -import java.awt.Shape; - import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.awt.Graphics2D; +import java.awt.Shape; + import com.samskivert.util.Predicate; import com.samskivert.util.SortableArrayList; diff --git a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java b/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java index 75168202..1dcbc537 100644 --- a/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java +++ b/src/java/com/threerings/media/tile/SimpleCachingImageProvider.java @@ -21,13 +21,13 @@ package com.threerings.media.tile; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; - import java.util.Map; import java.io.IOException; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; + import com.samskivert.util.LRUHashMap; import com.threerings.media.image.BufferedMirage; diff --git a/src/java/com/threerings/media/tile/TileSet.java b/src/java/com/threerings/media/tile/TileSet.java index e0ad7b15..17001d8d 100644 --- a/src/java/com/threerings/media/tile/TileSet.java +++ b/src/java/com/threerings/media/tile/TileSet.java @@ -23,14 +23,14 @@ package com.threerings.media.tile; import java.lang.ref.SoftReference; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; - import java.util.Iterator; import java.util.Map; import java.io.Serializable; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; + import com.google.common.collect.Maps; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/media/tile/TrimmedTileSet.java b/src/java/com/threerings/media/tile/TrimmedTileSet.java index 26ee7d30..87366255 100644 --- a/src/java/com/threerings/media/tile/TrimmedTileSet.java +++ b/src/java/com/threerings/media/tile/TrimmedTileSet.java @@ -21,11 +21,11 @@ package com.threerings.media.tile; -import java.awt.Rectangle; - import java.io.IOException; import java.io.OutputStream; +import java.awt.Rectangle; + import com.threerings.resource.FastImageIO; import com.threerings.media.image.Colorization; diff --git a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java index 55f1f945..45f37601 100644 --- a/src/java/com/threerings/media/tile/bundle/TileSetBundle.java +++ b/src/java/com/threerings/media/tile/bundle/TileSetBundle.java @@ -23,8 +23,6 @@ package com.threerings.media.tile.bundle; import java.util.Iterator; -import java.util.Iterator; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; 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 5b028fbe..d97da143 100644 --- a/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java +++ b/src/java/com/threerings/media/tile/bundle/tools/TileSetBundler.java @@ -21,8 +21,6 @@ package com.threerings.media.tile.bundle.tools; -import java.awt.image.BufferedImage; - import java.util.ArrayList; import java.util.Iterator; import java.util.jar.JarEntry; @@ -36,6 +34,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectOutputStream; +import java.awt.image.BufferedImage; + import javax.imageio.ImageIO; import org.xml.sax.SAXException; diff --git a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java index 3a19cf60..1abe7e7e 100644 --- a/src/java/com/threerings/media/tile/util/TileSetTrimmer.java +++ b/src/java/com/threerings/media/tile/util/TileSetTrimmer.java @@ -21,15 +21,15 @@ package com.threerings.media.tile.util; +import java.io.IOException; +import java.io.OutputStream; + import java.awt.Rectangle; 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; diff --git a/src/java/com/threerings/media/tools/RecolorImage.java b/src/java/com/threerings/media/tools/RecolorImage.java index 2a4f86c2..799cf67e 100644 --- a/src/java/com/threerings/media/tools/RecolorImage.java +++ b/src/java/com/threerings/media/tools/RecolorImage.java @@ -21,6 +21,15 @@ package com.threerings.media.tools; +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 java.awt.BorderLayout; import java.awt.Color; import java.awt.Graphics; @@ -31,15 +40,6 @@ 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; diff --git a/src/java/com/threerings/media/util/AStarPathUtil.java b/src/java/com/threerings/media/util/AStarPathUtil.java index 23347e6e..cc26901f 100644 --- a/src/java/com/threerings/media/util/AStarPathUtil.java +++ b/src/java/com/threerings/media/util/AStarPathUtil.java @@ -28,11 +28,6 @@ import java.util.TreeSet; import java.awt.Point; -import java.util.ArrayList; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - import com.samskivert.util.HashIntMap; /** diff --git a/src/java/com/threerings/media/util/LineSegmentPath.java b/src/java/com/threerings/media/util/LineSegmentPath.java index c3811b80..5ea31b9e 100644 --- a/src/java/com/threerings/media/util/LineSegmentPath.java +++ b/src/java/com/threerings/media/util/LineSegmentPath.java @@ -21,14 +21,14 @@ package com.threerings.media.util; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Point; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Point; + import com.samskivert.util.StringUtil; import com.threerings.util.DirectionCodes; diff --git a/src/java/com/threerings/miso/client/MisoScenePanel.java b/src/java/com/threerings/miso/client/MisoScenePanel.java index 73732903..07a9b5ad 100644 --- a/src/java/com/threerings/miso/client/MisoScenePanel.java +++ b/src/java/com/threerings/miso/client/MisoScenePanel.java @@ -23,6 +23,12 @@ package com.threerings.miso.client; import java.lang.ref.WeakReference; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; + import java.awt.AlphaComposite; import java.awt.BasicStroke; import java.awt.Color; @@ -43,12 +49,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; - import javax.swing.Icon; import javax.swing.JFrame; diff --git a/src/java/com/threerings/miso/client/ObjectActionHandler.java b/src/java/com/threerings/miso/client/ObjectActionHandler.java index a20ef8fa..e25d2f7f 100644 --- a/src/java/com/threerings/miso/client/ObjectActionHandler.java +++ b/src/java/com/threerings/miso/client/ObjectActionHandler.java @@ -21,10 +21,10 @@ package com.threerings.miso.client; -import java.awt.event.ActionEvent; - import java.util.HashMap; +import java.awt.event.ActionEvent; + import javax.swing.Icon; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/miso/client/RethinkOp.java b/src/java/com/threerings/miso/client/RethinkOp.java index 4c2caa6a..a0bcf550 100644 --- a/src/java/com/threerings/miso/client/RethinkOp.java +++ b/src/java/com/threerings/miso/client/RethinkOp.java @@ -1,10 +1,10 @@ package com.threerings.miso.client; +import java.util.Set; + import java.awt.Point; import java.awt.Rectangle; -import java.util.Set; - import com.google.common.collect.Sets; import com.threerings.media.util.MathUtil; diff --git a/src/java/com/threerings/miso/client/SceneObjectIndicator.java b/src/java/com/threerings/miso/client/SceneObjectIndicator.java index 286d3de1..4cd84aea 100644 --- a/src/java/com/threerings/miso/client/SceneObjectIndicator.java +++ b/src/java/com/threerings/miso/client/SceneObjectIndicator.java @@ -1,10 +1,10 @@ package com.threerings.miso.client; +import java.util.Collection; + 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 aec299e8..9c887756 100644 --- a/src/java/com/threerings/miso/client/SceneObjectTip.java +++ b/src/java/com/threerings/miso/client/SceneObjectTip.java @@ -30,7 +30,6 @@ import java.awt.Font; import java.awt.Graphics2D; import java.awt.Rectangle; - import javax.swing.Icon; import javax.swing.UIManager; diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/java/com/threerings/miso/tile/AutoFringer.java index 1b720c27..98536f56 100644 --- a/src/java/com/threerings/miso/tile/AutoFringer.java +++ b/src/java/com/threerings/miso/tile/AutoFringer.java @@ -23,15 +23,15 @@ package com.threerings.miso.tile; import java.lang.ref.WeakReference; -import java.awt.Graphics2D; -import java.awt.Transparency; -import java.awt.image.BufferedImage; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.awt.Graphics2D; +import java.awt.Transparency; +import java.awt.image.BufferedImage; + import com.google.common.collect.Lists; import com.samskivert.util.CheapIntMap; diff --git a/src/java/com/threerings/resource/FastImageIO.java b/src/java/com/threerings/resource/FastImageIO.java index e7eddd27..ca46f40d 100644 --- a/src/java/com/threerings/resource/FastImageIO.java +++ b/src/java/com/threerings/resource/FastImageIO.java @@ -21,14 +21,6 @@ package com.threerings.resource; -import java.awt.Point; -import java.awt.image.BufferedImage; -import java.awt.image.DataBuffer; -import java.awt.image.DataBufferByte; -import java.awt.image.IndexColorModel; -import java.awt.image.PixelInterleavedSampleModel; -import java.awt.image.WritableRaster; - import java.io.DataOutputStream; import java.io.File; import java.io.IOException; @@ -39,6 +31,14 @@ import java.nio.IntBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; +import java.awt.Point; +import java.awt.image.BufferedImage; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.IndexColorModel; +import java.awt.image.PixelInterleavedSampleModel; +import java.awt.image.WritableRaster; + /** * Provides routines for writing and reading uncompressed 8-bit color * mapped images in a manner that is extremely fast and generates a diff --git a/src/java/com/threerings/resource/FileResourceBundle.java b/src/java/com/threerings/resource/FileResourceBundle.java index 6859174f..071b096d 100644 --- a/src/java/com/threerings/resource/FileResourceBundle.java +++ b/src/java/com/threerings/resource/FileResourceBundle.java @@ -21,8 +21,6 @@ package com.threerings.resource; -import java.awt.image.BufferedImage; - import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -33,6 +31,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.awt.image.BufferedImage; + import org.apache.commons.io.IOUtils; import com.samskivert.util.FileUtil; diff --git a/src/java/com/threerings/resource/Handler.java b/src/java/com/threerings/resource/Handler.java index 4b0723a8..6fa7c6e4 100644 --- a/src/java/com/threerings/resource/Handler.java +++ b/src/java/com/threerings/resource/Handler.java @@ -26,13 +26,13 @@ import java.net.URLConnection; import java.net.URLStreamHandler; import java.security.Permission; -import java.awt.Rectangle; -import java.awt.image.BufferedImage; - import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.awt.Rectangle; +import java.awt.image.BufferedImage; + import javax.imageio.ImageIO; import com.samskivert.io.ByteArrayOutInputStream; diff --git a/src/java/com/threerings/resource/NetworkResourceBundle.java b/src/java/com/threerings/resource/NetworkResourceBundle.java index e7a68b63..5ea5fd6a 100644 --- a/src/java/com/threerings/resource/NetworkResourceBundle.java +++ b/src/java/com/threerings/resource/NetworkResourceBundle.java @@ -26,13 +26,13 @@ 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 java.awt.image.BufferedImage; + 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 0ea71764..51253b21 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 c9d6cbd9..f045b62d 100644 --- a/src/java/com/threerings/resource/ResourceManager.java +++ b/src/java/com/threerings/resource/ResourceManager.java @@ -24,9 +24,6 @@ package com.threerings.resource; import java.security.AccessController; import java.security.PrivilegedAction; -import java.awt.EventQueue; -import java.awt.image.BufferedImage; - import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -45,6 +42,9 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.awt.EventQueue; +import java.awt.image.BufferedImage; + import javax.imageio.ImageIO; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; diff --git a/src/java/com/threerings/util/KeyboardManager.java b/src/java/com/threerings/util/KeyboardManager.java index f8d6e465..97b0cb4d 100644 --- a/src/java/com/threerings/util/KeyboardManager.java +++ b/src/java/com/threerings/util/KeyboardManager.java @@ -21,6 +21,9 @@ package com.threerings.util; +import java.util.HashMap; +import java.util.Iterator; + import java.awt.KeyEventDispatcher; import java.awt.KeyboardFocusManager; import java.awt.Window; @@ -28,9 +31,6 @@ import java.awt.event.KeyEvent; import java.awt.event.WindowEvent; import java.awt.event.WindowFocusListener; -import java.util.HashMap; -import java.util.Iterator; - import javax.swing.JComponent; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent;