Mercurial > dive4elements > river
changeset 8398:ae750e3fa9ea
Backed out changeset da67b2bca1c0 Not needed.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 09 Oct 2014 12:13:30 +0200 |
| parents | da67b2bca1c0 |
| children | c668520cc5fb |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsFilterBuilder.java |
| diffstat | 1 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsFilterBuilder.java Thu Oct 09 11:57:17 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FixingsFilterBuilder.java Thu Oct 09 12:13:30 2014 +0200 @@ -11,7 +11,9 @@ import org.dive4elements.river.artifacts.model.FixingsOverview.AndFilter; import org.dive4elements.river.artifacts.model.FixingsOverview.DateFilter; import org.dive4elements.river.artifacts.model.FixingsOverview.DateRangeFilter; + import org.dive4elements.river.artifacts.model.FixingsOverview.Fixing.Filter; + import org.dive4elements.river.artifacts.model.FixingsOverview.IdFilter; import org.dive4elements.river.artifacts.model.FixingsOverview.IdsFilter; import org.dive4elements.river.artifacts.model.FixingsOverview.KmFilter; @@ -22,13 +24,13 @@ import java.text.ParsePosition; import java.text.SimpleDateFormat; + import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.apache.log4j.Logger; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -38,8 +40,6 @@ { private static Logger log = Logger.getLogger(FixingsFilterBuilder.class); - private static final Pattern IS_LONG = Pattern.compile("^\\s*(-?\\d+)\\s*$"); - protected Filter filter; protected Range range; @@ -131,10 +131,6 @@ } protected static final Date parseDate(String text) { - Matcher m = IS_LONG.matcher(text); - if (m.matches()) { - return new Date(Long.valueOf(m.group(1))); - } SimpleDateFormat format = new SimpleDateFormat(FixingsOverview.DATE_FORMAT); return format.parse(text, new ParsePosition(0));