From 2ee6ddb35583401521f415878d8209f74f915429 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Mon, 19 Jul 2010 18:57:22 +0000
Subject: [PATCH] Rather than put things in a HashSet and then use the "sorted
 iterator", which really copies everything to an ArrayList and sorts it, let's
 just throw the elements into a TreeSet and iterate over that.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@942 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../threerings/stage/tools/editor/SceneInfoPanel.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java b/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java
index 9d963426..4e158851 100644
--- a/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java
+++ b/src/java/com/threerings/stage/tools/editor/SceneInfoPanel.java
@@ -21,8 +21,7 @@
 
 package com.threerings.stage.tools.editor;
 
-import java.util.HashSet;
-import java.util.Iterator;
+import java.util.TreeSet;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -40,7 +39,6 @@ import javax.swing.event.PopupMenuListener;
 
 import com.google.common.collect.Sets;
 
-import com.samskivert.util.Collections;
 import com.samskivert.util.ComparableArrayList;
 
 import com.samskivert.swing.GroupLayout;
@@ -173,7 +171,7 @@ public class SceneInfoPanel extends JPanel
     {
         // add all possible colorization names to the list
         final TileManager tilemgr = _ctx.getTileManager();
-        final HashSet<String> set = Sets.newHashSet();
+        final TreeSet<String> set = Sets.newTreeSet();
         StageMisoSceneModel msmodel = StageMisoSceneModel.getSceneModel(
             _scene.getSceneModel());
         msmodel.visitObjects(new ObjectVisitor() {
@@ -203,9 +201,8 @@ public class SceneInfoPanel extends JPanel
         DefaultComboBoxModel model =
             (DefaultComboBoxModel) _colorClasses.getModel();
         model.removeAllElements();
-        for (Iterator<String> itr = Collections.getSortedIterator(set);
-                itr.hasNext(); ) {
-            model.addElement(itr.next());
+        for (String zation : set) {
+            model.addElement(zation);
         }
         if (selected != null) {
             _colorClasses.setSelectedItem(selected);