--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java	Mon Oct 01 15:51:55 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java	Mon Oct 01 18:32:27 2012 +0200
@@ -9,24 +9,6 @@
 {
     private static final Logger log = Logger.getLogger(Measurements.class);
 
-    /**
-     * Gets the accumulated for this instance.
-     *
-     * @return The accumulated.
-     */
-    public List<Measurement> getAccumulated() {
-        return this.accumulated;
-    }
-
-    /**
-     * Sets the accumulated for this instance.
-     *
-     * @param accumulated The accumulated.
-     */
-    public void setAccumulated(List<Measurement> accumulated) {
-        this.accumulated = accumulated;
-    }
-
     public interface SExtractor {
         double getS(Measurement measument);
     } // interface SExtractor
@@ -87,8 +69,11 @@
         this.accumulated = accumulated;
     }
 
-    public List<SQ> extractSQ(SExtractor extractor) {
-        List<SQ> result = new ArrayList(measuments.size());
+    public static List<SQ> extractSQ(
+        List<Measurement> measuments,
+        SExtractor extractor
+    ) {
+        List<SQ> result = new ArrayList<SQ>(measuments.size());
         for (Measurement measument: measuments) {
             SQ sq = new SQ(extractor.getS(measument), measument.Q());
             if (sq.isValid()) {
@@ -99,27 +84,27 @@
     }
 
     public List<SQ> S_SF() {
-        return extractSQ(S_SF_EXTRACTOR);
+        return extractSQ(measuments, S_SF_EXTRACTOR);
     }
 
     public List<SQ> S_SS() {
-        return extractSQ(S_SS_EXTRACTOR);
+        return extractSQ(measuments, S_SS_EXTRACTOR);
     }
 
     public List<SQ> S_BL_S() {
-        return extractSQ(S_BL_S_EXTRACTOR);
+        return extractSQ(accumulated, S_BL_S_EXTRACTOR);
     }
 
     public List<SQ> S_BL_FG() {
-        return extractSQ(S_BL_FG_EXTRACTOR);
+        return extractSQ(accumulated, S_BL_FG_EXTRACTOR);
     }
 
     public List<SQ> S_BL_CG() {
-        return extractSQ(S_BL_CG_EXTRACTOR);
+        return extractSQ(accumulated, S_BL_CG_EXTRACTOR);
     }
 
     public List<SQ> S_BL() {
-        return extractSQ(S_BL_EXTRACTOR);
+        return extractSQ(accumulated, S_BL_EXTRACTOR);
     }
 
     public List<SQ> getSQs(int index) {
@@ -135,6 +120,25 @@
         return new ArrayList<SQ>(0);
     }
 
+    /**
+     * Gets the accumulated for this instance.
+     *
+     * @return The accumulated.
+     */
+    public List<Measurement> getAccumulated() {
+        return this.accumulated;
+    }
+
+    /**
+     * Sets the accumulated for this instance.
+     *
+     * @param accumulated The accumulated.
+     */
+    public void setAccumulated(List<Measurement> accumulated) {
+        this.accumulated = accumulated;
+    }
+
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("Measurements [");