[Dive4elements-commits] [PATCH] Fix build: some more imports some less imports some copy paste errors

Wald Commits scm-commit at wald.intevation.org
Wed Feb 20 17:24:54 CET 2013


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1361377489 -3600
# Branch dami
# Node ID fb7c4ad94bd801317a1e9e1a30c88e367f270ad2
# Parent  de97e02822847bcc292975a9d700b4795cedb89a
Fix build: some more imports some less imports some copy paste errors

diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/BoundaryKind.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/BoundaryKind.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/BoundaryKind.java	Wed Feb 20 17:24:49 2013 +0100
@@ -1,14 +1,10 @@
 package de.intevation.flys.model;
 
 import java.io.Serializable;
-import java.util.List;
-import java.math.BigDecimal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 import org.hibernate.Session;
@@ -20,7 +16,7 @@
 @Table(name = "boundary_kinds")
 public class BoundaryKind implements Serializable {
     private Integer id;
-    private String kind;
+    private String name;
 
     @Id
     @Column(name = "id")
diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/FedState.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/FedState.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/FedState.java	Wed Feb 20 17:24:49 2013 +0100
@@ -1,8 +1,6 @@
 package de.intevation.flys.model;
 
 import java.io.Serializable;
-import java.util.List;
-import java.math.BigDecimal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/HWSKind.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/HWSKind.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HWSKind.java	Wed Feb 20 17:24:49 2013 +0100
@@ -1,14 +1,10 @@
 package de.intevation.flys.model;
 
 import java.io.Serializable;
-import java.util.List;
-import java.math.BigDecimal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 import org.hibernate.Session;
@@ -20,7 +16,7 @@
 @Table(name = "hws_kinds")
 public class HWSKind implements Serializable {
     private Integer id;
-    private String kind;
+    private String name;
 
     @Id
     @Column(name = "id")
diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/HWSLine.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/HWSLine.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HWSLine.java	Wed Feb 20 17:24:49 2013 +0100
@@ -1,8 +1,6 @@
 package de.intevation.flys.model;
 
 import java.io.Serializable;
-import java.util.List;
-import java.math.BigDecimal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -13,8 +11,12 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
+import org.hibernate.annotations.Type;
 
 import de.intevation.flys.backend.SessionHolder;
+import de.intevation.flys.model.HWSKind;
+
+import com.vividsolutions.jts.geom.Geometry;
 
 @Entity
 @Table(name = "hws_lines")
diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java	Wed Feb 20 17:24:49 2013 +0100
@@ -13,6 +13,10 @@
 
 import org.hibernate.Session;
 import org.hibernate.Query;
+import org.hibernate.annotations.Type;
+
+import com.vividsolutions.jts.geom.Geometry;
+
 
 import de.intevation.flys.backend.SessionHolder;
 
diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/SectieKind.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/SectieKind.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/SectieKind.java	Wed Feb 20 17:24:49 2013 +0100
@@ -1,14 +1,10 @@
 package de.intevation.flys.model;
 
 import java.io.Serializable;
-import java.util.List;
-import java.math.BigDecimal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 import org.hibernate.Session;
@@ -20,7 +16,7 @@
 @Table(name = "sectie_kinds")
 public class SectieKind implements Serializable {
     private Integer id;
-    private String kind;
+    private String name;
 
     @Id
     @Column(name = "id")
diff -r de97e0282284 -r fb7c4ad94bd8 flys-backend/src/main/java/de/intevation/flys/model/SobekKind.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/SobekKind.java	Wed Feb 20 17:05:06 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/SobekKind.java	Wed Feb 20 17:24:49 2013 +0100
@@ -1,14 +1,10 @@
 package de.intevation.flys.model;
 
 import java.io.Serializable;
-import java.util.List;
-import java.math.BigDecimal;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
 import org.hibernate.Session;
@@ -20,7 +16,7 @@
 @Table(name = "sobek_kinds")
 public class SobekKind implements Serializable {
     private Integer id;
-    private String kind;
+    private String name;
 
     @Id
     @Column(name = "id")


More information about the Dive4elements-commits mailing list