From 85ca7f1c4564aa297f5842be99100f5d295d8795 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 11 Nov 2010 17:13:37 +0000 Subject: [PATCH] Made ClassRecord and ColorRecord comparable on name. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1064 ed5b42cb-e716-0410-a449-f6a68f950b19 --- .../threerings/media/image/ColorPository.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/threerings/media/image/ColorPository.java b/src/main/java/com/threerings/media/image/ColorPository.java index ed101bc8..1e13b11c 100644 --- a/src/main/java/com/threerings/media/image/ColorPository.java +++ b/src/main/java/com/threerings/media/image/ColorPository.java @@ -58,7 +58,7 @@ public class ColorPository implements Serializable * Used to store information on a class of colors. These are public to simplify the XML * parsing process, so pay them no mind. */ - public static class ClassRecord implements Serializable + public static class ClassRecord implements Serializable, Comparable { /** An integer identifier for this class. */ public int classId; @@ -172,6 +172,12 @@ public class ColorPository implements Serializable return colors.get(defaultId); } + // from interface Comparable + public int compareTo (ClassRecord other) + { + return name.compareTo(other.name); + } + @Override public String toString () { @@ -193,7 +199,7 @@ public class ColorPository implements Serializable * Used to store information on a particular color. These are public to simplify the XML * parsing process, so pay them no mind. */ - public static class ColorRecord implements Serializable + public static class ColorRecord implements Serializable, Comparable { /** The colorization class to which we belong. */ public ClassRecord cclass; @@ -235,6 +241,12 @@ public class ColorPository implements Serializable return new Colorization(getColorPrint(), cclass.source, cclass.range, offsets); } + // from interface Comparable + public int compareTo (ColorRecord other) + { + return name.compareTo(other.name); + } + @Override public String toString () {