diff backend/src/main/java/org/dive4elements/river/model/FastAnnotations.java @ 8406:6ae0c5116d58

Distinguish between types of measurement stations and filter appropriately (plus minor cleanup in related classes).
author Tom Gottfried <tom@intevation.de>
date Tue, 14 Oct 2014 12:41:37 +0200
parents 4c3ccf2b0304
children 4809e23ffd27
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/model/FastAnnotations.java	Mon Oct 13 17:22:52 2014 +0200
+++ b/backend/src/main/java/org/dive4elements/river/model/FastAnnotations.java	Tue Oct 14 12:41:37 2014 +0200
@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.regex.Pattern;
 
 import java.io.Serializable;
 
@@ -160,15 +161,15 @@
 
     public static class NameFilter implements Filter {
 
-        private String name;
+        private Pattern namePattern;
 
         public NameFilter(String name) {
-            this.name = name;
+            this.namePattern = Pattern.compile(name);
         }
 
         @Override
         public boolean accept(Annotation annotation) {
-            return annotation.getName().contains(name);
+            return namePattern.matcher(annotation.getName()).matches();
         }
     } // class NameFilter
 

http://dive4elements.wald.intevation.org