Brought code in line with changes to Samskivert. I have not started to

genericize Narya data structures, nor make the existing code type safe. That's
going to be an extremely large project.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4007 542714f4-19e9-0310-aa3c-eee0fc999fb1

src/java/com/threerings/media/FrameManager.java

@@ -45,9 +45,9 @@ import javax.swing.RepaintManager;
 import javax.swing.event.AncestorEvent;
 import javax.swing.event.AncestorListener;
 
+import com.samskivert.swing.RuntimeAdjust;
 import com.samskivert.util.ListUtil;
 import com.samskivert.util.RunAnywhere;
-import com.samskivert.util.RuntimeAdjust;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.media.timer.MediaTimer;

src/java/com/threerings/media/MediaPanel.java

@@ -43,10 +43,10 @@ import java.util.ArrayList;
 
 import com.samskivert.swing.Controller;
 import com.samskivert.swing.Label;
+import com.samskivert.swing.RuntimeAdjust;
 import com.samskivert.swing.event.AncestorAdapter;
 import com.samskivert.swing.event.CommandEvent;
 import com.samskivert.util.IntListUtil;
-import com.samskivert.util.RuntimeAdjust;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.media.timer.MediaTimer;

src/java/com/threerings/media/image/ImageManager.java

@@ -39,8 +39,8 @@ import java.util.Iterator;
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageInputStream;
 
+import com.samskivert.swing.RuntimeAdjust;
 import com.samskivert.util.LRUHashMap;
-import com.samskivert.util.RuntimeAdjust;
 import com.samskivert.util.StringUtil;
 import com.samskivert.util.Throttle;
 import com.samskivert.util.Tuple;

src/java/com/threerings/media/sound/SoundManager.java

@@ -46,12 +46,12 @@ import javax.sound.sampled.UnsupportedAudioFileException;
 
 import org.apache.commons.io.IOUtils;
 
+import com.samskivert.swing.RuntimeAdjust;
 import com.samskivert.util.Config;
 import com.samskivert.util.ConfigUtil;
 import com.samskivert.util.Interval;
 import com.samskivert.util.LRUHashMap;
 import com.samskivert.util.Queue;
-import com.samskivert.util.RuntimeAdjust;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.resource.ResourceManager;

src/java/com/threerings/media/tile/bundle/TileSetBundle.java

@@ -118,9 +118,9 @@ public class TileSetBundle extends HashIntMap
     {
         out.writeInt(size());
 
-        Iterator entries = entrySet().iterator();
+        Iterator entries = intEntrySet().iterator();
         while (entries.hasNext()) {
-            Entry entry = (Entry)entries.next();
+            IntEntry entry = (IntEntry)entries.next();
             out.writeInt(entry.getIntKey());
             out.writeObject(entry.getValue());
         }