changeset 3218:e0e9a2629d7d

FixA: Moved IdGenerator to top level class. flys-artifacts/trunk@4841 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Sun, 01 Jul 2012 08:41:43 +0000 (2012-07-01)
parents 79dd823733e2
children fa30e6322ef3
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java flys-artifacts/src/main/java/de/intevation/flys/utils/IdGenerator.java
diffstat 3 files changed, 28 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Sat Jun 30 22:02:37 2012 +0000
+++ b/flys-artifacts/ChangeLog	Sun Jul 01 08:41:43 2012 +0000
@@ -1,3 +1,11 @@
+2012-06-30	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java:
+	  Removed embedded class IdGenerator.
+
+	* src/main/java/de/intevation/flys/utils/IdGenerator.java:
+	  New. Re-added the id generator as top level class.
+
 2012-06-30	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	Added parameter exporter for fixings analysis.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Sat Jun 30 22:02:37 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Sun Jul 01 08:41:43 2012 +0000
@@ -32,6 +32,8 @@
 
 import de.intevation.flys.artifacts.states.DefaultState;
 
+import de.intevation.flys.utils.IdGenerator;
+
 import java.text.DateFormat;
 
 import java.util.List;
@@ -69,21 +71,6 @@
         "[HQ5 - \u221e)"
     };
 
-    public static class IdGenerator {
-        private int id;
-
-        public IdGenerator() {
-        }
-
-        public IdGenerator(int id) {
-            this.id = id;
-        }
-
-        public int next() {
-            return id++;
-        }
-    } // class IdGenerator
-
     /**
      * The default constructor that initializes an empty State object.
      */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/IdGenerator.java	Sun Jul 01 08:41:43 2012 +0000
@@ -0,0 +1,18 @@
+package de.intevation.flys.utils;
+
+public class IdGenerator {
+
+    protected int id;
+
+    public IdGenerator() {
+    }
+
+    public IdGenerator(int id) {
+        this.id = id;
+    }
+
+    public int next() {
+        return id++;
+    }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :

http://dive4elements.wald.intevation.org