From 32cf5110aa058463cc915a0254142f90354eda8e Mon Sep 17 00:00:00 2001 From: Timotei Dolean Date: Sun, 10 Apr 2011 10:31:40 +0000 Subject: [PATCH] eclipse plugin: Implement the serializable as well, so if this comparator is used by a TreeMap it can be serialized Issue found by "FindBugs" --- utils/java/org.wesnoth/src/org/wesnoth/schema/Tag.java | 7 +++++-- utils/java/org.wesnoth/src/org/wesnoth/schema/TagKey.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/utils/java/org.wesnoth/src/org/wesnoth/schema/Tag.java b/utils/java/org.wesnoth/src/org/wesnoth/schema/Tag.java index 6cc9f45da79..875db3edb11 100644 --- a/utils/java/org.wesnoth/src/org/wesnoth/schema/Tag.java +++ b/utils/java/org.wesnoth/src/org/wesnoth/schema/Tag.java @@ -8,6 +8,7 @@ *******************************************************************************/ package org.wesnoth.schema; +import java.io.Serializable; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -216,9 +217,11 @@ public class Tag /** * A tag comparator that sorts just after required cardinality. */ - public static class CardinalityComparator implements Comparator + public static class CardinalityComparator implements Comparator, Serializable { - @Override + private static final long serialVersionUID = 6586560133116048689L; + + @Override public int compare(Tag o1, Tag o2) { if (o1.cardinality_ == o2.cardinality_) diff --git a/utils/java/org.wesnoth/src/org/wesnoth/schema/TagKey.java b/utils/java/org.wesnoth/src/org/wesnoth/schema/TagKey.java index 15afc895ec7..9d3e13136da 100644 --- a/utils/java/org.wesnoth/src/org/wesnoth/schema/TagKey.java +++ b/utils/java/org.wesnoth/src/org/wesnoth/schema/TagKey.java @@ -8,6 +8,7 @@ *******************************************************************************/ package org.wesnoth.schema; +import java.io.Serializable; import java.util.Comparator; /** @@ -58,9 +59,11 @@ public class TagKey /** * A tag comparator that sorts just after required cardinality. */ - public static class CardinalityComparator implements Comparator + public static class CardinalityComparator implements Comparator, Serializable { - @Override + private static final long serialVersionUID = 6103884038547449868L; + + @Override public int compare(TagKey o1, TagKey o2) { if (o1.cardinality_ == o2.cardinality_)