Fix WildcardTrie using SimpleCharacterClasses: ensure the uniqueness of values

src/main/java/org/culturegraph/mf/morph/Data.java

@@ -42,4 +42,8 @@ public void setName(final String name) {
 		this.name = name;
 	}
 
+	@Override
+	public String toString() {
+		return name;
+	}
 }

src/main/java/org/culturegraph/mf/util/tries/WildcardTrie.java

@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -26,6 +28,7 @@
  * A simple Trie, which accepts a trailing wildcard
  * 
  * @author Markus Michael Geipel
+ * @author Pascal Christoph
  * 
  * @param <P>
  *            type of value stored
@@ -77,7 +80,6 @@ private void simplyPut(final String key, final P value) {
 
 	public List<P> get(final String key) {
 
-
 		nodes.add(root);
 		final int length = key.length();
 		for (int i = 0; i < length; ++i) {
@@ -111,7 +113,7 @@ public List<P> get(final String key) {
 
 		List<P> matches = Collections.emptyList();
 		for (Node<P> node : nodes) {
-			final List<P> values = node.getValues();
+			final Set<P> values = node.getValues();
 			if (!values.isEmpty()) {
 				if (matches == Collections.emptyList()) {
 					matches = new ArrayList<P>();
@@ -130,7 +132,7 @@ public List<P> get(final String key) {
 	 */
 	private final class Node<T> {
 
-		private List<T> values = Collections.emptyList();
+		private Set<T> values =  Collections.emptySet();
 		private final CharMap<Node<T>> links = new CharMap<Node<T>>();
 
 		protected Node() {
@@ -143,18 +145,17 @@ public Node<T> addNext(final char key) {
 			if (key == STAR_WILDCARD) {
 				next.links.put(STAR_WILDCARD, next);
 			}
-
 			return next;
 		}
 
 		public void addValue(final T value) {
-			if (values == Collections.emptyList()) {
-				values = new ArrayList<T>();
+			if (values == Collections.emptySet()) {
+				values = new LinkedHashSet<T>();
 			}
 			this.values.add(value);
 		}
 
-		public List<T> getValues() {
+		public Set<T> getValues() {
 			return values;
 		}
 

src/test/java/org/culturegraph/mf/util/tries/SimpleRegexTrieTest.java

@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2013 Pascal Christoph, hbz
+ *  Licensed under the Apache License, Version 2.0 the "License";
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.culturegraph.mf.util.tries;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * tests {@link SimpleRegexTrie}
+ * 
+ * @author Pascal Christoph
+ * 
+ */
+public final class SimpleRegexTrieTest {
+	private static final String SCC = "aacbb|a[ab]bb";
+	private static final String AACBB = "aacbb";
+
+	@Test
+	public void testWithSimpleCharacterClass() {
+		final SimpleRegexTrie<String> trie = new SimpleRegexTrie<String>();
+		trie.put(SCC, SCC);
+		assertTrue(AACBB, trie.get(AACBB).size() == 1);
+	}
+}