--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java	Tue May 15 14:24:09 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java	Tue May 15 15:33:43 2012 +0000
@@ -128,7 +128,7 @@
         final HTMLPane eventPane = new HTMLPane();
 
         String river = artifact.getArtifactDescription().getRiver();
-
+        fixFilter.setRiver(river);
         createCallback();
 /*
 Filter example.
@@ -139,7 +139,7 @@
         overviewService.generateOverview(
             locale,
             artifact.getUuid(),
-            "{\"fixings\": {\"river\": {\"name\": \"" + river + "\"}}}",
+            fixFilter.getOverviewFilter(),
             renderCheckboxes(),
             callBack,
             new AsyncCallback<FixingsOverviewInfo>() {
@@ -303,11 +303,23 @@
         protected double currentKm;
         protected int fromClass;
         protected int toClass;
-        protected Date fromDate;
-        protected Date toDate;
+        protected long fromDate;
+        protected long toDate;
+        protected boolean hasDate;
         protected int[] events;
 
-        public FixFilter() {}
+        public FixFilter() {
+            this.river = "";
+            this.fromKm = -1d;
+            this.toKm = -1;
+            this.currentKm = -1;
+            this.fromClass = -1;
+            this.toClass = -1;
+            this.fromDate = -1;
+            this.toDate = -1;
+            this.hasDate = false;
+            this.events = new int[0];
+        }
 
         public void setRiver(String river) {
             this.river = river;
@@ -333,11 +345,13 @@
             this.toClass = to;
         }
 
-        public void setFromDate(Date from) {
+        public void setFromDate(long from) {
+            this.hasDate = true;
             this.fromDate = from;
         }
 
-        public void setToDate(Date to) {
+        public void setToDate(long to) {
+            this.hasDate = true;
             this.toDate = to;
         }
 
@@ -369,11 +383,11 @@
             return this.toClass;
         }
 
-        public Date getFromDate() {
+        public long getFromDate() {
             return this.fromDate;
         }
 
-        public Date getToDate() {
+        public long getToDate() {
             return this.toDate;
         }