From 50e4daaf0cbace1ced4641f50da68df18ef6516a Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Wed, 14 Jul 2010 21:02:21 +0000
Subject: [PATCH] Use ComparisonChain here. Does anyone know if these
 colorization names can indeed be null? Otherwise we can remove the null-safe
 comparator. It was previously calling ObjectUtil.compareTo() which leads me
 to think it needed null-safety.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@939 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../stage/tools/editor/ObjectEditorDialog.java    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java b/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
index 9d95e2bd..ac6fe470 100644
--- a/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
+++ b/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java
@@ -22,6 +22,7 @@
 package com.threerings.stage.tools.editor;
 
 import java.util.Arrays;
+import java.util.Comparator;
 
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
@@ -30,8 +31,9 @@ import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JTextField;
 
-import com.samskivert.util.Comparators;
-import com.samskivert.util.ObjectUtil;
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Ordering;
+
 import com.samskivert.util.StringUtil;
 
 import com.samskivert.swing.HGroupLayout;
@@ -220,15 +222,18 @@ public class ObjectEditorDialog extends EditorDialog
         }
 
         public int compareTo (ZationChoice that) {
-            return Comparators.combine(
-                ObjectUtil.compareTo(this.name, that.name),
-                Comparators.compare(this.colorId, that.colorId));
+            return ComparisonChain.start()
+                .compare(this.name, that.name, NULLS_OK)
+                .compare(this.colorId, that.colorId)
+                .result();
         }
 
         @Override
         public String toString () {
             return name;
         }
+
+        protected static final Comparator<String> NULLS_OK = Ordering.natural().nullsFirst();
     }
 
     protected JTextField _action;