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
This commit is contained in:
Michael Bayne
2006-04-10 08:59:30 +00:00
parent 02b59f33c9
commit 5a2583470c
24 changed files with 49 additions and 48 deletions
@@ -53,9 +53,9 @@ import java.util.List;
import com.samskivert.swing.Controller;
import com.samskivert.swing.RadialMenu;
import com.samskivert.swing.RuntimeAdjust;
import com.samskivert.swing.event.CommandEvent;
import com.samskivert.util.HashIntMap;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.util.StringUtil;
import com.threerings.media.VirtualMediaPanel;
@@ -1,5 +1,5 @@
//
// $Id: SceneObject.java,v 1.12 2004/10/28 17:49:02 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -29,7 +29,7 @@ import java.awt.Point;
import java.awt.Polygon;
import java.awt.Rectangle;
import com.samskivert.util.RuntimeAdjust;
import com.samskivert.swing.RuntimeAdjust;
import com.samskivert.util.StringUtil;
import com.threerings.media.tile.NoSuchTileSetException;
@@ -1,5 +1,5 @@
//
// $Id: SceneObjectTip.java,v 1.6 2004/08/27 02:20:06 mdb Exp $
// $Id$
//
// Narya library - tools for developing networked games
// Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -35,8 +35,8 @@ 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.util.SortableArrayList;
/**
* A lightweight tooltip used by the {@link MisoScenePanel}. The tip
@@ -192,7 +192,7 @@ public class SceneObjectTip extends LabelSausage
}
/** Contains a sorted list of layout registrations. */
protected static SortableArrayList _layouts = new SortableArrayList();
protected static ComparableArrayList _layouts = new ComparableArrayList();
/** The number of pixels to pad around the icon. */
protected static final int ICON_PAD = 4;