[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1362651931 -3600
# Node ID 25cafe0a974d3cb65c37e8d00b3914c1279645dc
# Parent  e8e092c00791efc6d3f1da39d8122d223769e80e
# Parent  0a83a796f7cf5c127726db33de187ef0cd7d9d17
merge

diff -r e8e092c00791 -r 25cafe0a974d flys-backend/src/main/java/de/intevation/flys/model/HWSLine.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/HWSLine.java	Thu Mar 07 11:20:52 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HWSLine.java	Thu Mar 07 11:25:31 2013 +0100
@@ -33,7 +33,7 @@
     private HWSKind  kind;
     private FedState fedState;
     private River    river;
-    private Integer  offical;
+    private Integer  official;
     private Integer  shoreSide;
     private String   name;
     private String   path;
@@ -93,22 +93,22 @@
 
 
     /**
-     * Get offical.
+     * Get official.
      *
-     * @return offical as Integer.
+     * @return official as Integer.
      */
-    @Column(name = "offical")
-    public Integer getOffical() {
-        return offical;
+    @Column(name = "official")
+    public Integer getofficial() {
+        return official;
     }
 
     /**
-     * Set offical.
+     * Set official.
      *
-     * @param offical the value to set.
+     * @param official the value to set.
      */
-    public void setOffical(Integer offical) {
-        this.offical = offical;
+    public void setofficial(Integer official) {
+        this.official = official;
     }
 
     /**
diff -r e8e092c00791 -r 25cafe0a974d flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java	Thu Mar 07 11:20:52 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HWSPoint.java	Thu Mar 07 11:25:31 2013 +0100
@@ -28,7 +28,7 @@
     private HWSKind    kind;
     private FedState   fedState;
     private River      river;
-    private Integer    offical;
+    private Integer    official;
     private Integer    shoreSide;
     private String     name;
     private String     path;
@@ -94,22 +94,22 @@
 
 
     /**
-     * Get offical.
+     * Get official.
      *
-     * @return offical as Integer.
+     * @return official as Integer.
      */
-    @Column(name = "offical")
-    public Integer getOffical() {
-        return offical;
+    @Column(name = "official")
+    public Integer getofficial() {
+        return official;
     }
 
     /**
-     * Set offical.
+     * Set official.
      *
-     * @param offical the value to set.
+     * @param official the value to set.
      */
-    public void setOffical(Integer offical) {
-        this.offical = offical;
+    public void setofficial(Integer official) {
+        this.official = official;
     }
 
     /**