--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java	Mon Oct 01 10:42:53 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java	Mon Oct 01 14:03:13 2012 +0200
@@ -21,27 +21,12 @@
 
     protected List<Sieve> sieves;
 
-    protected SieveArray  sieveArray;
-
-    protected Measurement prev;
-    protected Measurement next;
-
     public Measurement() {
     }
 
     public Measurement(Map<String, Object> data, List<Sieve> sieves) {
         this.data = data;
         this.sieves = sieves;
-        adjustOriginalSieves();
-        this.sieveArray = calculateSieveArray();
-    }
-
-    public Measurement head() {
-        Measurement current = this;
-        while (current.prev != null) {
-            current = current.prev;
-        }
-        return current;
     }
 
     protected double get(String name) {
@@ -53,10 +38,14 @@
         data.put(name, Double.valueOf(value));
     }
 
-    protected Object getData(String name) {
+    public Object getData(String name) {
         return data.get(name);
     }
 
+    public Map<String, Object> getData() {
+        return data;
+    }
+
     protected void putData(String name, Object value) {
         data.put(name, value);
     }
@@ -189,7 +178,7 @@
         }
     }
 
-    protected void adjustOriginalSieves() {
+    public void adjustSieves() {
 
         // If we already have an 8mm diameter sieve
         // we dont need to 'invent' it.