From 4610a48b238c0d6395bbe3855330427bfac001b4 Mon Sep 17 00:00:00 2001 From: Dave Hoover Date: Thu, 21 Jan 2010 00:38:36 +0000 Subject: [PATCH] I'd really like to make our build script blow up if we accidentally put in duplicate colorIds, but let's at least scream & not put the new color in. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@875 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/media/image/ColorPository.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/java/com/threerings/media/image/ColorPository.java b/src/java/com/threerings/media/image/ColorPository.java index a953da6f..ba58c176 100644 --- a/src/java/com/threerings/media/image/ColorPository.java +++ b/src/java/com/threerings/media/image/ColorPository.java @@ -90,6 +90,9 @@ public class ColorPository implements Serializable if (record.colorId > 127) { log.warning("Refusing to add color record; colorId > 127", "class", this, "record", record); + } else if (colors.containsKey(record.colorId)) { + log.warning("Refusing to add duplicate colorId", + "class", this, "record", record, "existing", colors.get(record.colorId)); } else { record.cclass = this; colors.put(record.colorId, record);