[Schmitzm-commits] r2058 - in trunk/schmitzm-adresses/src: main/java/de/schmitzm/adresses test/java/de/schmitzm/adresses

[scm-commit at wald.intevation.org]

Author: alfonx
Date: 2012-06-20 16:40:35 +0200 (Wed, 20 Jun 2012)
New Revision: 2058

Modified:
   trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
   trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java
   trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/RuleRegistryTest.java
Log:


Modified: trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java
===================================================================
--- trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2012-06-17 12:44:04 UTC (rev 2057)
+++ trunk/schmitzm-adresses/src/main/java/de/schmitzm/adresses/AddrStringUtil.java	2012-06-20 14:40:35 UTC (rev 2058)
@@ -580,6 +580,12 @@
 
 		strasse = RegexCache.getInstance().replaceAll(strasse, "str\\.ße", "str.");
 
+		strasse = RegexCache.getInstance().replaceAll(strasse, "\\bStr\\./hausnummer:?", "");
+		strasse = RegexCache.getInstance().replaceAll(strasse, "hausnummer", " ");
+		strasse = RegexCache.getInstance().replaceAll(strasse, "plz/ort", " ");
+		strasse = RegexCache.getInstance().replaceAll(strasse, "egli", " ");
+		strasse = RegexCache.getInstance().replaceAll(strasse, "\\*ort", " ");
+		
 		strasse = RegexCache.getInstance().replaceAll(strasse, "\\+", " ");
 		strasse = RegexCache.getInstance().replaceAll(strasse, "\\s\\s+", " ");
 		strasse = RegexCache.getInstance().replaceAll(strasse, "(\\d)\\s", "$1");

Modified: trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java
===================================================================
--- trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java	2012-06-17 12:44:04 UTC (rev 2057)
+++ trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/AddrStringUtilTest.java	2012-06-20 14:40:35 UTC (rev 2058)
@@ -1,7 +1,6 @@
 package de.schmitzm.adresses;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.util.Set;
 

Modified: trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/RuleRegistryTest.java
===================================================================
--- trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/RuleRegistryTest.java	2012-06-17 12:44:04 UTC (rev 2057)
+++ trunk/schmitzm-adresses/src/test/java/de/schmitzm/adresses/RuleRegistryTest.java	2012-06-20 14:40:35 UTC (rev 2058)
@@ -1,7 +1,6 @@
 package de.schmitzm.adresses;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.util.List;