fixed #129

Author: mgeipel

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

@@ -15,49 +15,75 @@
  */
 package org.culturegraph.mf.util.tries;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.culturegraph.mf.util.tries.SetMatcher.Match;
+
 /**
  * @author Markus Michael Geipel
- *
+ * 
  */
 public final class SetReplacer {
 	private final SetMatcher<String> matcher = new SetMatcher<String>();
-	
-	public void addReplacement(final String key, final String with){
+
+	public void addReplacement(final String key, final String with) {
 		matcher.put(key, with);
 	}
-	
-	public void addReplacements(final Map<String, String> replacements){
+
+	public void addReplacements(final Map<String, String> replacements) {
 		for (Entry<String, String> entry : replacements.entrySet()) {
 			addReplacement(entry.getKey(), entry.getValue());
 		}
 	}
-	
-	
-	public String replaceIn(final String text){
+
+	public String replaceIn(final String text) {
 		final List<SetMatcher.Match<String>> matches = matcher.match(text);
 		final StringBuilder builder = new StringBuilder();
-		
+
 		int lastCut = 0;
+
+		Collections.sort(matches, new Comparator<SetMatcher.Match<String>>() {
+			@Override
+			public int compare(final Match<String> o1, final Match<String> o2) {
+				final int result;
+				final int delta = o1.getStart() - o2.getStart();
+				if (delta < 0) {
+					result = -1;
+				} else if (delta > 0) {
+					result = 1;
+				} else {
+					if (o1.getLength() > o2.getLength()) {
+						result = -1;
+					} else {
+						result = 1;
+					}
+				}
+				return result;
+			}
+
+		});
+
 		for (SetMatcher.Match<String> match : matches) {
-			
-			if(match.getStart()<lastCut){
+
+			if (match.getStart() < lastCut) {
 				continue;
 			}
-			
-			//System.out.println(match.getStart() + " "+ match.getValue() +" "+ match.getLength());
-			
+
+			// System.out.println(match.getStart() + " "+ match.getValue() +" "+
+			// match.getLength());
+
 			builder.append(text.substring(lastCut, match.getStart()));
 			builder.append(match.getValue());
-			
+
 			lastCut = match.getStart() + match.getLength();
 		}
 		builder.append(text.substring(lastCut, text.length()));
-		
+
 		return builder.toString();
 	}
-	
+
 }

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

@@ -33,7 +33,7 @@ public void testReplace() {
 
 		final SetReplacer setReplace = new SetReplacer();
 		final String text = "auf sylt mit super krabben entsafter und apfel";
-		final String target = "auf hawaii mit super shirt entsafter und surfboard";
+		final String target = "auf hawaii mit Mai Tai und surfboard";
 
 		setReplace.addReplacement("sylt", "hawaii");
 		setReplace.addReplacement("apfel", "surfboard");
@@ -43,6 +43,7 @@ public void testReplace() {
 		assertEquals(target, setReplace.replaceIn(text));	
 	}
 
+	@Test
 	public void testReplaceWithInclusion() {
 
 		final SetReplacer setReplace = new SetReplacer();
@@ -52,7 +53,7 @@ public void testReplaceWithInclusion() {
 		setReplace.addReplacement("fünfzig", "50");
 
 		assertEquals("50 äpfel", setReplace.replaceIn("fünfzig äpfel"));	
-		assertEquals("5 äpfel", setReplace.replaceIn("fünfz äpfel"));
+		assertEquals("5 äpfel", setReplace.replaceIn("fünf äpfel"));
 	}
 
 }