changeset 4002:fdc6b1e64d01

Fix compiling bug
author Sascha L. Teichmann <teichmann@intevation.de>
date Mon, 01 Oct 2012 14:30:48 +0200
parents ab3a4ad82ae1
children 4d74a579c5c5
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java
diffstat 2 files changed, 12 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Oct 01 14:03:13 2012 +0200
+++ b/flys-artifacts/ChangeLog	Mon Oct 01 14:30:48 2012 +0200
@@ -1,3 +1,8 @@
+2012-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java:
+	  Make it compilable again.
+
 2012-10-01	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	 * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java	Mon Oct 01 14:03:13 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java	Mon Oct 01 14:30:48 2012 +0200
@@ -21,6 +21,8 @@
 
     protected List<Sieve> sieves;
 
+    protected SieveArray sieveArray;
+
     public Measurement() {
     }
 
@@ -121,43 +123,10 @@
      * @return The sieveArray.
      */
     public SieveArray getSieveArray() {
-        return this.sieveArray;
-    }
-
-    /**
-     * Gets the prev for this instance.
-     *
-     * @return The prev.
-     */
-    public Measurement getPrev() {
-        return this.prev;
-    }
-
-    /**
-     * Sets the prev for this instance.
-     *
-     * @param prev The prev.
-     */
-    public void setPrev(Measurement prev) {
-        this.prev = prev;
-    }
-
-    /**
-     * Gets the next for this instance.
-     *
-     * @return The next.
-     */
-    public Measurement getNext() {
-        return this.next;
-    }
-
-    /**
-     * Sets the next for this instance.
-     *
-     * @param next The next.
-     */
-    public void setNext(Measurement next) {
-        this.next = next;
+        if (sieveArray == null) {
+            sieveArray = calculateSieveArray();
+        }
+        return sieveArray;
     }
 
     protected Sieve findSieve(double diameter) {
@@ -210,8 +179,7 @@
 
         sieves.add(new Sieve(8d, eightValue));
         sieves.add(new Sieve(4d, newFourValue));
-   }
-
+    }
 
     public SieveArray calculateSieveArray() {
 

http://dive4elements.wald.intevation.org