--- a/flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java	Thu Feb 21 12:36:30 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java	Sun Feb 24 12:56:20 2013 +0100
@@ -1,7 +1,9 @@
 package de.intevation.flys.model;
 
+import com.vividsolutions.jts.geom.Geometry;
+
 import java.io.Serializable;
-import java.util.List;
+
 import java.math.BigDecimal;
 
 import javax.persistence.Column;
@@ -11,40 +13,33 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-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;
-
 @Entity
 @Table(name = "hws_points")
 public class HWSPoint implements Serializable {
 
     private Integer    id;
 
-    private Integer    ogr_fid;
+    private Integer    ogrFid;
     private HWSKind    kind;
-    private FedState  fedState;
-    private River     river;
-    private Integer   offical;
-    private Integer   shore_side;
-    private String    name;
-    private String    path;
-    private String    agency;
-    private String    range;
-    private String    source;
-    private String    status_date;
-    private String    description;
-    private BigDecimal    freeboard;
-    private BigDecimal    dike_km;
-    private BigDecimal    z;
-    private BigDecimal    z_target;
-    private BigDecimal    rated_level;
-    private Geometry     geom;
+    private FedState   fedState;
+    private River      river;
+    private Integer    offical;
+    private Integer    shoreSide;
+    private String     name;
+    private String     path;
+    private String     agency;
+    private String     range;
+    private String     source;
+    private String     statusDate;
+    private String     description;
+    private BigDecimal freeboard;
+    private BigDecimal dikeKm;
+    private BigDecimal z;
+    private BigDecimal zTarget;
+    private BigDecimal ratedLevel;
+    private Geometry   geom;
 
     @Id
     @Column(name = "id")
@@ -69,24 +64,22 @@
     }
 
     /**
-     * Get ogr_fid.
+     * Get ogrFid.
      *
-     * @return ogr_fid as Integer.
+     * @return ogrFid as Integer.
      */
     @Column(name = "ogr_fid")
-    public Integer getOgrFid()
-    {
-        return ogr_fid;
+    public Integer getOgrFid() {
+        return ogrFid;
     }
 
     /**
-     * Set ogr_fid.
+     * Set ogrFid.
      *
-     * @param ogr_fid the value to set.
+     * @param ogrFid the value to set.
      */
-    public void setOgrFid(Integer ogr_fid)
-    {
-        this.ogr_fid = ogr_fid;
+    public void setOgrFid(Integer ogrFid) {
+        this.ogrFid = ogrFid;
     }
 
 
@@ -96,8 +89,7 @@
      * @return offical as Integer.
      */
     @Column(name = "offical")
-    public Integer getOffical()
-    {
+    public Integer getOffical() {
         return offical;
     }
 
@@ -106,30 +98,27 @@
      *
      * @param offical the value to set.
      */
-    public void setOffical(Integer offical)
-    {
+    public void setOffical(Integer offical) {
         this.offical = offical;
     }
 
     /**
-     * Get shore_side.
+     * Get shoreSide.
      *
-     * @return shore_side as Integer.
+     * @return shoreSide as Integer.
      */
     @Column(name = "shore_side")
-    public Integer getShoreSide()
-    {
-        return shore_side;
+    public Integer getShoreSide() {
+        return shoreSide;
     }
 
     /**
-     * Set shore_side.
+     * Set shoreSide.
      *
-     * @param shore_side the value to set.
+     * @param shoreSide the value to set.
      */
-    public void setShoreSide(Integer shore_side)
-    {
-        this.shore_side = shore_side;
+    public void setShoreSide(Integer shoreSide) {
+        this.shoreSide = shoreSide;
     }
 
     /**
@@ -138,8 +127,7 @@
      * @return name as String.
      */
     @Column(name = "name")
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
 
@@ -148,8 +136,7 @@
      *
      * @param name the value to set.
      */
-    public void setName(String name)
-    {
+    public void setName(String name) {
         this.name = name;
     }
 
@@ -159,8 +146,7 @@
      * @return path as String.
      */
     @Column(name = "path")
-    public String getPath()
-    {
+    public String getPath() {
         return path;
     }
 
@@ -169,8 +155,7 @@
      *
      * @param path the value to set.
      */
-    public void setPath(String path)
-    {
+    public void setPath(String path) {
         this.path = path;
     }
 
@@ -180,8 +165,7 @@
      * @return agency as String.
      */
     @Column(name = "agency")
-    public String getAgency()
-    {
+    public String getAgency() {
         return agency;
     }
 
@@ -190,8 +174,7 @@
      *
      * @param agency the value to set.
      */
-    public void setAgency(String agency)
-    {
+    public void setAgency(String agency) {
         this.agency = agency;
     }
 
@@ -201,8 +184,7 @@
      * @return range as String.
      */
     @Column(name = "range")
-    public String getRange()
-    {
+    public String getRange() {
         return range;
     }
 
@@ -211,8 +193,7 @@
      *
      * @param range the value to set.
      */
-    public void setRange(String range)
-    {
+    public void setRange(String range) {
         this.range = range;
     }
 
@@ -222,8 +203,7 @@
      * @return source as String.
      */
     @Column(name = "source")
-    public String getSource()
-    {
+    public String getSource() {
         return source;
     }
 
@@ -232,30 +212,28 @@
      *
      * @param source the value to set.
      */
-    public void setSource(String source)
-    {
+    public void setSource(String source) {
         this.source = source;
     }
 
     /**
-     * Get status_date.
+     * Get statusDate.
      *
-     * @return status_date as String.
+     * @return statusDate as String.
      */
     @Column(name = "status_date")
-    public String getStatusDate()
-    {
-        return status_date;
+    public String getStatusDate() {
+        return statusDate;
     }
 
     /**
-     * Set status_date.
+     * Set statusDate.
      *
-     * @param status_date the value to set.
+     * @param statusDate the value to set.
      */
-    public void setStatusDate(String status_date)
+    public void setStatusDate(String statusDate)
     {
-        this.status_date = status_date;
+        this.statusDate = statusDate;
     }
 
     /**
@@ -301,24 +279,24 @@
     }
 
     /**
-     * Get dike_km.
+     * Get dikeKm.
      *
-     * @return dike_km as BigDecimal.
+     * @return dikeKm as BigDecimal.
      */
     @Column(name = "dike_km")
-    public BigDecimal getDike_km()
+    public BigDecimal getDikeKm()
     {
-        return dike_km;
+        return dikeKm;
     }
 
     /**
-     * Set dike_km.
+     * Set dikeKm.
      *
-     * @param dike_km the value to set.
+     * @param dikeKm the value to set.
      */
-    public void setDike_km(BigDecimal dike_km)
+    public void setDikeKm(BigDecimal dikeKm)
     {
-        this.dike_km = dike_km;
+        this.dikeKm = dikeKm;
     }
 
     /**
@@ -343,45 +321,45 @@
     }
 
     /**
-     * Get z_target.
+     * Get zTarget.
      *
-     * @return z_target as BigDecimal.
+     * @return zTarget as BigDecimal.
      */
     @Column(name = "z_target")
     public BigDecimal getZTarget()
     {
-        return z_target;
+        return zTarget;
     }
 
     /**
-     * Set z_target.
+     * Set zTarget.
      *
-     * @param z_target the value to set.
+     * @param zTarget the value to set.
      */
-    public void setZTarget(BigDecimal z_target)
+    public void setZTarget(BigDecimal zTarget)
     {
-        this.z_target = z_target;
+        this.zTarget = zTarget;
     }
 
     /**
-     * Get rated_level.
+     * Get ratedLevel.
      *
-     * @return rated_level as BigDecimal.
+     * @return ratedLevel as BigDecimal.
      */
     @Column(name = "rated_level")
     public BigDecimal getRatedLevel()
     {
-        return rated_level;
+        return ratedLevel;
     }
 
     /**
-     * Set rated_level.
+     * Set ratedLevel.
      *
-     * @param rated_level the value to set.
+     * @param ratedLevel the value to set.
      */
-    public void setRatedLevel(BigDecimal rated_level)
+    public void setRatedLevel(BigDecimal ratedLevel)
     {
-        this.rated_level = rated_level;
+        this.ratedLevel = ratedLevel;
     }
 
     /**