changeset 3334:2ae732e2c65c

FLYS backend: Removed trailing whitespace. flys-backend/trunk@4669 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 15 Jun 2012 09:20:49 +0000 (2012-06-15)
parents 76c75c8b9ee0
children c3e049961685
files flys-backend/ChangeLog flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java flys-backend/src/main/java/de/intevation/flys/importer/parsers/HYKParser.java flys-backend/src/main/java/de/intevation/flys/importer/parsers/PRFParser.java flys-backend/src/main/java/de/intevation/flys/model/CrossSection.java flys-backend/src/main/java/de/intevation/flys/model/CrossSectionLine.java flys-backend/src/main/java/de/intevation/flys/model/FastAnnotations.java flys-backend/src/main/java/de/intevation/flys/model/HYKFormation.java flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegel.java flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegelgew.java flys-backend/src/main/java/de/intevation/seddb/model/BezugspegelgewId.java flys-backend/src/main/java/de/intevation/seddb/model/Bild.java flys-backend/src/main/java/de/intevation/seddb/model/Gewaesser.java flys-backend/src/main/java/de/intevation/seddb/model/Gfaenger.java flys-backend/src/main/java/de/intevation/seddb/model/Glotlinks.java flys-backend/src/main/java/de/intevation/seddb/model/GlotlinksId.java flys-backend/src/main/java/de/intevation/seddb/model/Glotrechte.java flys-backend/src/main/java/de/intevation/seddb/model/Gprobe.java flys-backend/src/main/java/de/intevation/seddb/model/GprobeId.java flys-backend/src/main/java/de/intevation/seddb/model/Gsiebsatz.java flys-backend/src/main/java/de/intevation/seddb/model/Gsiebung.java flys-backend/src/main/java/de/intevation/seddb/model/Gsiebungsieb.java flys-backend/src/main/java/de/intevation/seddb/model/GsiebungsiebId.java flys-backend/src/main/java/de/intevation/seddb/model/Hpeilpunkt.java flys-backend/src/main/java/de/intevation/seddb/model/HpeilpunktId.java flys-backend/src/main/java/de/intevation/seddb/model/Hpeilung.java flys-backend/src/main/java/de/intevation/seddb/model/Messung.java flys-backend/src/main/java/de/intevation/seddb/model/Messunglotcount.java flys-backend/src/main/java/de/intevation/seddb/model/MessunglotcountId.java flys-backend/src/main/java/de/intevation/seddb/model/Messungsta.java flys-backend/src/main/java/de/intevation/seddb/model/MessungstaId.java flys-backend/src/main/java/de/intevation/seddb/model/Messunguferbezug.java flys-backend/src/main/java/de/intevation/seddb/model/MessunguferbezugId.java flys-backend/src/main/java/de/intevation/seddb/model/Mpeilpunkt.java flys-backend/src/main/java/de/intevation/seddb/model/MpeilpunktId.java flys-backend/src/main/java/de/intevation/seddb/model/Mpeilung.java flys-backend/src/main/java/de/intevation/seddb/model/Probebild.java flys-backend/src/main/java/de/intevation/seddb/model/Siebanalyse.java flys-backend/src/main/java/de/intevation/seddb/model/Slotlinks.java flys-backend/src/main/java/de/intevation/seddb/model/SlotlinksId.java flys-backend/src/main/java/de/intevation/seddb/model/Slotrechte.java flys-backend/src/main/java/de/intevation/seddb/model/Sohlprobe.java flys-backend/src/main/java/de/intevation/seddb/model/Sohltest.java flys-backend/src/main/java/de/intevation/seddb/model/Sprobe.java flys-backend/src/main/java/de/intevation/seddb/model/SprobeId.java flys-backend/src/main/java/de/intevation/seddb/model/Ssiebung.java flys-backend/src/main/java/de/intevation/seddb/model/Ssiebungsieb.java flys-backend/src/main/java/de/intevation/seddb/model/SsiebungsiebId.java flys-backend/src/main/java/de/intevation/seddb/model/Station.java flys-backend/src/main/java/de/intevation/seddb/model/Stationgew.java flys-backend/src/main/java/de/intevation/seddb/model/StationgewId.java flys-backend/src/main/java/de/intevation/seddb/model/TmpGloChanged.java flys-backend/src/main/java/de/intevation/seddb/model/TmpMesAchanged.java flys-backend/src/main/java/de/intevation/seddb/model/TmpMesGchanged.java flys-backend/src/main/java/de/intevation/seddb/model/TmpMesQchanged.java flys-backend/src/main/java/de/intevation/seddb/model/TmpMesSchanged.java flys-backend/src/main/java/de/intevation/seddb/model/Zzarchiv.java flys-backend/src/main/java/de/intevation/seddb/model/Zzprobenahmeart.java flys-backend/src/main/java/de/intevation/seddb/model/Zzsondierungart.java flys-backend/src/main/java/de/intevation/seddb/model/Zzthema.java
diffstat 60 files changed, 1515 insertions(+), 1511 deletions(-) [+]
line wrap: on
line diff
--- a/flys-backend/ChangeLog	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/ChangeLog	Fri Jun 15 09:20:49 2012 +0000
@@ -1,3 +1,7 @@
+2012-06-15	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/**/*.java: Removed trailing whitespace.
+
 2012-06-14	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	 Make access to SedDB configurable over conf.xml and provide
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportHYKFlowZone.java	Fri Jun 15 09:20:49 2012 +0000
@@ -68,7 +68,7 @@
             else {
                 peer = zones.get(0);
             }
-            
+
         }
         return peer;
     }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/HYKParser.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/HYKParser.java	Fri Jun 15 09:20:49 2012 +0000
@@ -225,7 +225,7 @@
                             return false;
                         }
                         try {
-                            for (int i = 0; 
+                            for (int i = 0;
                                 i < parts.length && coordPos < coords.length;
                                 ++i, ++coordPos
                             ) {
@@ -233,7 +233,7 @@
                             }
                         }
                         catch (NumberFormatException nfe) {
-                            log.error("cannot parse number in line " + 
+                            log.error("cannot parse number in line " +
                                 in.getLineNumber());
                             return false;
                         }
@@ -241,7 +241,7 @@
                             BigDecimal a = coords[i];
                             BigDecimal b = coords[i == coords.length-1 ? i : i+1];
                             if (a.compareTo(b) > 0) {
-                                log.warn("zone coordinates swapped in line " + 
+                                log.warn("zone coordinates swapped in line " +
                                     in.getLineNumber());
                                 BigDecimal c = a; a = b; b = c;
                             }
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/PRFParser.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/PRFParser.java	Fri Jun 15 09:20:49 2012 +0000
@@ -94,7 +94,7 @@
                     pos, pos + firstIntegerPlaces);
 
                 String second = line.substring(
-                    pos + firstIntegerPlaces, 
+                    pos + firstIntegerPlaces,
                     Math.min(L, pos+firstIntegerPlaces+secondIntegerPlaces));
 
                 double x, y;
--- a/flys-backend/src/main/java/de/intevation/flys/model/CrossSection.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/CrossSection.java	Fri Jun 15 09:20:49 2012 +0000
@@ -42,7 +42,7 @@
         "FROM cross_section_lines csl JOIN cross_section_points csp " +
         "ON csp.cross_section_line_id = csl.id " +
         "WHERE csl.cross_section_id = :cs_id AND " +
-        "km between :from_km AND :to_km " + 
+        "km between :from_km AND :to_km " +
         "ORDER BY csl.id, csp.col_pos";
 
     private Integer                id;
--- a/flys-backend/src/main/java/de/intevation/flys/model/CrossSectionLine.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/CrossSectionLine.java	Fri Jun 15 09:20:49 2012 +0000
@@ -122,7 +122,7 @@
 
     public List<Point2D> fetchCrossSectionLinesPoints() {
 
-        List<CrossSectionPoint> linePoints = 
+        List<CrossSectionPoint> linePoints =
             new ArrayList<CrossSectionPoint>(getPoints());
 
         Collections.sort(linePoints, COL_POS_CMP);
@@ -164,7 +164,7 @@
                 }
 
                 xs[i] = x;
-                ys[i] = y; 
+                ys[i] = y;
             }
         }
 
--- a/flys-backend/src/main/java/de/intevation/flys/model/FastAnnotations.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/FastAnnotations.java	Fri Jun 15 09:20:49 2012 +0000
@@ -208,7 +208,7 @@
             private int idx;
             private Annotation current = findNext();
 
-            @Override 
+            @Override
             public boolean hasNext() {
                 return current != null;
             }
--- a/flys-backend/src/main/java/de/intevation/flys/model/HYKFormation.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/HYKFormation.java	Fri Jun 15 09:20:49 2012 +0000
@@ -38,9 +38,9 @@
     }
 
     public HYKFormation(
-        Integer    formationNum, 
-        HYKEntry   entry, 
-        BigDecimal top, 
+        Integer    formationNum,
+        HYKEntry   entry,
+        BigDecimal top,
         BigDecimal bottom,
         BigDecimal distanceVL,
         BigDecimal distanceHF,
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegel.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegel.java	Fri Jun 15 09:20:49 2012 +0000
@@ -24,7 +24,7 @@
 @Entity
 @Table(name="BEZUGSPEGEL"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames={"GEWAESSERID", "NAME"}) 
+    , uniqueConstraints = @UniqueConstraint(columnNames={"GEWAESSERID", "NAME"})
 )
 public class Bezugspegel  implements java.io.Serializable {
 
@@ -82,15 +82,15 @@
        this.bemerkung = bemerkung;
        this.stations = stations;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="BEZUGSPEGELID", unique=true, nullable=false, precision=11, scale=0)
     public long getBezugspegelid() {
         return this.bezugspegelid;
     }
-    
+
     public void setBezugspegelid(long bezugspegelid) {
         this.bezugspegelid = bezugspegelid;
     }
@@ -100,57 +100,57 @@
     public Gewaesser getGewaesser() {
         return this.gewaesser;
     }
-    
+
     public void setGewaesser(Gewaesser gewaesser) {
         this.gewaesser = gewaesser;
     }
 
-    
+
     @Column(name="KM", nullable=false, precision=8, scale=3)
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
 
-    
+
     @Column(name="NAME", nullable=false, length=50)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="NULLPUNKT", nullable=false, precision=8, scale=3)
     public BigDecimal getNullpunkt() {
         return this.nullpunkt;
     }
-    
+
     public void setNullpunkt(BigDecimal nullpunkt) {
         this.nullpunkt = nullpunkt;
     }
 
-    
+
     @Column(name="KENNUNG", length=16)
     public String getKennung() {
         return this.kennung;
     }
-    
+
     public void setKennung(String kennung) {
         this.kennung = kennung;
     }
 
-    
+
     @Column(name="EINZUGSGEBIET", precision=10)
     public BigDecimal getEinzugsgebiet() {
         return this.einzugsgebiet;
     }
-    
+
     public void setEinzugsgebiet(BigDecimal einzugsgebiet) {
         this.einzugsgebiet = einzugsgebiet;
     }
@@ -160,77 +160,77 @@
     public Date getInbetrieb() {
         return this.inbetrieb;
     }
-    
+
     public void setInbetrieb(Date inbetrieb) {
         this.inbetrieb = inbetrieb;
     }
 
-    
+
     @Column(name="FLIESSCHARAKTER", length=3)
     public String getFliesscharakter() {
         return this.fliesscharakter;
     }
-    
+
     public void setFliesscharakter(String fliesscharakter) {
         this.fliesscharakter = fliesscharakter;
     }
 
-    
+
     @Column(name="LAUFENTWICKLUNG", precision=7, scale=3)
     public BigDecimal getLaufentwicklung() {
         return this.laufentwicklung;
     }
-    
+
     public void setLaufentwicklung(BigDecimal laufentwicklung) {
         this.laufentwicklung = laufentwicklung;
     }
 
-    
+
     @Column(name="MNQ", precision=8, scale=3)
     public BigDecimal getMnq() {
         return this.mnq;
     }
-    
+
     public void setMnq(BigDecimal mnq) {
         this.mnq = mnq;
     }
 
-    
+
     @Column(name="MQ", precision=8, scale=3)
     public BigDecimal getMq() {
         return this.mq;
     }
-    
+
     public void setMq(BigDecimal mq) {
         this.mq = mq;
     }
 
-    
+
     @Column(name="MHQ", precision=8, scale=3)
     public BigDecimal getMhq() {
         return this.mhq;
     }
-    
+
     public void setMhq(BigDecimal mhq) {
         this.mhq = mhq;
     }
 
-    
+
     @Column(name="NNQ", precision=8, scale=3)
     public BigDecimal getNnq() {
         return this.nnq;
     }
-    
+
     public void setNnq(BigDecimal nnq) {
         this.nnq = nnq;
     }
 
-    
+
     @Column(name="HHQ", precision=8, scale=3)
     public BigDecimal getHhq() {
         return this.hhq;
     }
-    
+
     public void setHhq(BigDecimal hhq) {
         this.hhq = hhq;
     }
@@ -240,7 +240,7 @@
     public Date getNnqdatum() {
         return this.nnqdatum;
     }
-    
+
     public void setNnqdatum(Date nnqdatum) {
         this.nnqdatum = nnqdatum;
     }
@@ -250,27 +250,27 @@
     public Date getHhqdatum() {
         return this.hhqdatum;
     }
-    
+
     public void setHhqdatum(Date hhqdatum) {
         this.hhqdatum = hhqdatum;
     }
 
-    
+
     @Column(name="JAHRESREIHE", length=12)
     public String getJahresreihe() {
         return this.jahresreihe;
     }
-    
+
     public void setJahresreihe(String jahresreihe) {
         this.jahresreihe = jahresreihe;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -279,7 +279,7 @@
     public Set<Station> getStations() {
         return this.stations;
     }
-    
+
     public void setStations(Set<Station> stations) {
         this.stations = stations;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegelgew.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Bezugspegelgew.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,34 +27,34 @@
     public Bezugspegelgew(BezugspegelgewId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
     @AttributeOverrides( {
-        @AttributeOverride(name="bezugspegelid", column=@Column(name="BEZUGSPEGELID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="gewaesserid", column=@Column(name="GEWAESSERID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="km", column=@Column(name="KM", nullable=false, precision=8, scale=3) ), 
-        @AttributeOverride(name="name", column=@Column(name="NAME", nullable=false, length=50) ), 
-        @AttributeOverride(name="nullpunkt", column=@Column(name="NULLPUNKT", nullable=false, precision=8, scale=3) ), 
-        @AttributeOverride(name="kennung", column=@Column(name="KENNUNG", length=16) ), 
-        @AttributeOverride(name="einzugsgebiet", column=@Column(name="EINZUGSGEBIET", precision=10) ), 
-        @AttributeOverride(name="inbetrieb", column=@Column(name="INBETRIEB", length=7) ), 
-        @AttributeOverride(name="fliesscharakter", column=@Column(name="FLIESSCHARAKTER", length=3) ), 
-        @AttributeOverride(name="laufentwicklung", column=@Column(name="LAUFENTWICKLUNG", precision=7, scale=3) ), 
-        @AttributeOverride(name="mnq", column=@Column(name="MNQ", precision=8, scale=3) ), 
-        @AttributeOverride(name="mq", column=@Column(name="MQ", precision=8, scale=3) ), 
-        @AttributeOverride(name="mhq", column=@Column(name="MHQ", precision=8, scale=3) ), 
-        @AttributeOverride(name="nnq", column=@Column(name="NNQ", precision=8, scale=3) ), 
-        @AttributeOverride(name="hhq", column=@Column(name="HHQ", precision=8, scale=3) ), 
-        @AttributeOverride(name="nnqdatum", column=@Column(name="NNQDATUM", length=7) ), 
-        @AttributeOverride(name="hhqdatum", column=@Column(name="HHQDATUM", length=7) ), 
-        @AttributeOverride(name="jahresreihe", column=@Column(name="JAHRESREIHE", length=12) ), 
-        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ), 
+        @AttributeOverride(name="bezugspegelid", column=@Column(name="BEZUGSPEGELID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="gewaesserid", column=@Column(name="GEWAESSERID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="km", column=@Column(name="KM", nullable=false, precision=8, scale=3) ),
+        @AttributeOverride(name="name", column=@Column(name="NAME", nullable=false, length=50) ),
+        @AttributeOverride(name="nullpunkt", column=@Column(name="NULLPUNKT", nullable=false, precision=8, scale=3) ),
+        @AttributeOverride(name="kennung", column=@Column(name="KENNUNG", length=16) ),
+        @AttributeOverride(name="einzugsgebiet", column=@Column(name="EINZUGSGEBIET", precision=10) ),
+        @AttributeOverride(name="inbetrieb", column=@Column(name="INBETRIEB", length=7) ),
+        @AttributeOverride(name="fliesscharakter", column=@Column(name="FLIESSCHARAKTER", length=3) ),
+        @AttributeOverride(name="laufentwicklung", column=@Column(name="LAUFENTWICKLUNG", precision=7, scale=3) ),
+        @AttributeOverride(name="mnq", column=@Column(name="MNQ", precision=8, scale=3) ),
+        @AttributeOverride(name="mq", column=@Column(name="MQ", precision=8, scale=3) ),
+        @AttributeOverride(name="mhq", column=@Column(name="MHQ", precision=8, scale=3) ),
+        @AttributeOverride(name="nnq", column=@Column(name="NNQ", precision=8, scale=3) ),
+        @AttributeOverride(name="hhq", column=@Column(name="HHQ", precision=8, scale=3) ),
+        @AttributeOverride(name="nnqdatum", column=@Column(name="NNQDATUM", length=7) ),
+        @AttributeOverride(name="hhqdatum", column=@Column(name="HHQDATUM", length=7) ),
+        @AttributeOverride(name="jahresreihe", column=@Column(name="JAHRESREIHE", length=12) ),
+        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ),
         @AttributeOverride(name="gewname", column=@Column(name="GEWNAME", nullable=false, length=20) ) } )
     public BezugspegelgewId getId() {
         return this.id;
     }
-    
+
     public void setId(BezugspegelgewId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/BezugspegelgewId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/BezugspegelgewId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -68,14 +68,14 @@
        this.bemerkung = bemerkung;
        this.gewname = gewname;
     }
-   
+
 
 
     @Column(name="BEZUGSPEGELID", nullable=false, precision=11, scale=0)
     public long getBezugspegelid() {
         return this.bezugspegelid;
     }
-    
+
     public void setBezugspegelid(long bezugspegelid) {
         this.bezugspegelid = bezugspegelid;
     }
@@ -85,7 +85,7 @@
     public long getGewaesserid() {
         return this.gewaesserid;
     }
-    
+
     public void setGewaesserid(long gewaesserid) {
         this.gewaesserid = gewaesserid;
     }
@@ -95,7 +95,7 @@
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
@@ -105,7 +105,7 @@
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
@@ -115,7 +115,7 @@
     public BigDecimal getNullpunkt() {
         return this.nullpunkt;
     }
-    
+
     public void setNullpunkt(BigDecimal nullpunkt) {
         this.nullpunkt = nullpunkt;
     }
@@ -125,7 +125,7 @@
     public String getKennung() {
         return this.kennung;
     }
-    
+
     public void setKennung(String kennung) {
         this.kennung = kennung;
     }
@@ -135,7 +135,7 @@
     public BigDecimal getEinzugsgebiet() {
         return this.einzugsgebiet;
     }
-    
+
     public void setEinzugsgebiet(BigDecimal einzugsgebiet) {
         this.einzugsgebiet = einzugsgebiet;
     }
@@ -145,7 +145,7 @@
     public Date getInbetrieb() {
         return this.inbetrieb;
     }
-    
+
     public void setInbetrieb(Date inbetrieb) {
         this.inbetrieb = inbetrieb;
     }
@@ -155,7 +155,7 @@
     public String getFliesscharakter() {
         return this.fliesscharakter;
     }
-    
+
     public void setFliesscharakter(String fliesscharakter) {
         this.fliesscharakter = fliesscharakter;
     }
@@ -165,7 +165,7 @@
     public BigDecimal getLaufentwicklung() {
         return this.laufentwicklung;
     }
-    
+
     public void setLaufentwicklung(BigDecimal laufentwicklung) {
         this.laufentwicklung = laufentwicklung;
     }
@@ -175,7 +175,7 @@
     public BigDecimal getMnq() {
         return this.mnq;
     }
-    
+
     public void setMnq(BigDecimal mnq) {
         this.mnq = mnq;
     }
@@ -185,7 +185,7 @@
     public BigDecimal getMq() {
         return this.mq;
     }
-    
+
     public void setMq(BigDecimal mq) {
         this.mq = mq;
     }
@@ -195,7 +195,7 @@
     public BigDecimal getMhq() {
         return this.mhq;
     }
-    
+
     public void setMhq(BigDecimal mhq) {
         this.mhq = mhq;
     }
@@ -205,7 +205,7 @@
     public BigDecimal getNnq() {
         return this.nnq;
     }
-    
+
     public void setNnq(BigDecimal nnq) {
         this.nnq = nnq;
     }
@@ -215,7 +215,7 @@
     public BigDecimal getHhq() {
         return this.hhq;
     }
-    
+
     public void setHhq(BigDecimal hhq) {
         this.hhq = hhq;
     }
@@ -225,7 +225,7 @@
     public Date getNnqdatum() {
         return this.nnqdatum;
     }
-    
+
     public void setNnqdatum(Date nnqdatum) {
         this.nnqdatum = nnqdatum;
     }
@@ -235,7 +235,7 @@
     public Date getHhqdatum() {
         return this.hhqdatum;
     }
-    
+
     public void setHhqdatum(Date hhqdatum) {
         this.hhqdatum = hhqdatum;
     }
@@ -245,7 +245,7 @@
     public String getJahresreihe() {
         return this.jahresreihe;
     }
-    
+
     public void setJahresreihe(String jahresreihe) {
         this.jahresreihe = jahresreihe;
     }
@@ -255,7 +255,7 @@
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -265,7 +265,7 @@
     public String getGewname() {
         return this.gewname;
     }
-    
+
     public void setGewname(String gewname) {
         this.gewname = gewname;
     }
@@ -275,8 +275,8 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof BezugspegelgewId) ) return false;
-         BezugspegelgewId castOther = ( BezugspegelgewId ) other; 
-         
+         BezugspegelgewId castOther = ( BezugspegelgewId ) other;
+
          return (this.getBezugspegelid()==castOther.getBezugspegelid())
  && (this.getGewaesserid()==castOther.getGewaesserid())
  && ( (this.getKm()==castOther.getKm()) || ( this.getKm()!=null && castOther.getKm()!=null && this.getKm().equals(castOther.getKm()) ) )
@@ -298,10 +298,10 @@
  && ( (this.getBemerkung()==castOther.getBemerkung()) || ( this.getBemerkung()!=null && castOther.getBemerkung()!=null && this.getBemerkung().equals(castOther.getBemerkung()) ) )
  && ( (this.getGewname()==castOther.getGewname()) || ( this.getGewname()!=null && castOther.getGewname()!=null && this.getGewname().equals(castOther.getGewname()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getBezugspegelid();
          result = 37 * result + (int) this.getGewaesserid();
          result = 37 * result + ( getKm() == null ? 0 : this.getKm().hashCode() );
@@ -323,5 +323,5 @@
          result = 37 * result + ( getBemerkung() == null ? 0 : this.getBemerkung().hashCode() );
          result = 37 * result + ( getGewname() == null ? 0 : this.getGewname().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Bild.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Bild.java	Fri Jun 15 09:20:49 2012 +0000
@@ -59,15 +59,15 @@
        this.typmittel = typmittel;
        this.typgross = typgross;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="BILDID", unique=true, nullable=false, precision=11, scale=0)
     public long getBildid() {
         return this.bildid;
     }
-    
+
     public void setBildid(long bildid) {
         this.bildid = bildid;
     }
@@ -77,7 +77,7 @@
     public Zzthema getZzthema() {
         return this.zzthema;
     }
-    
+
     public void setZzthema(Zzthema zzthema) {
         this.zzthema = zzthema;
     }
@@ -87,107 +87,107 @@
     public Sohltest getSohltest() {
         return this.sohltest;
     }
-    
+
     public void setSohltest(Sohltest sohltest) {
         this.sohltest = sohltest;
     }
 
-    
+
     @Column(name="LFDNR", nullable=false, precision=5, scale=0)
     public int getLfdnr() {
         return this.lfdnr;
     }
-    
+
     public void setLfdnr(int lfdnr) {
         this.lfdnr = lfdnr;
     }
 
-    
+
     @Column(name="ISTDIGITAL", nullable=false, precision=1, scale=0)
     public boolean isIstdigital() {
         return this.istdigital;
     }
-    
+
     public void setIstdigital(boolean istdigital) {
         this.istdigital = istdigital;
     }
 
-    
+
     @Column(name="PFAD", length=512)
     public String getPfad() {
         return this.pfad;
     }
-    
+
     public void setPfad(String pfad) {
         this.pfad = pfad;
     }
 
-    
+
     @Column(name="STANDORT", length=50)
     public String getStandort() {
         return this.standort;
     }
-    
+
     public void setStandort(String standort) {
         this.standort = standort;
     }
 
-    
+
     @Column(name="MEDIUM", length=50)
     public String getMedium() {
         return this.medium;
     }
-    
+
     public void setMedium(String medium) {
         this.medium = medium;
     }
 
-    
+
     @Column(name="MEDPFAD", length=50)
     public String getMedpfad() {
         return this.medpfad;
     }
-    
+
     public void setMedpfad(String medpfad) {
         this.medpfad = medpfad;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
 
-    
+
     @Column(name="TYPKLEIN", length=8)
     public String getTypklein() {
         return this.typklein;
     }
-    
+
     public void setTypklein(String typklein) {
         this.typklein = typklein;
     }
 
-    
+
     @Column(name="TYPMITTEL", length=8)
     public String getTypmittel() {
         return this.typmittel;
     }
-    
+
     public void setTypmittel(String typmittel) {
         this.typmittel = typmittel;
     }
 
-    
+
     @Column(name="TYPGROSS", length=8)
     public String getTypgross() {
         return this.typgross;
     }
-    
+
     public void setTypgross(String typgross) {
         this.typgross = typgross;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Gewaesser.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gewaesser.java	Fri Jun 15 09:20:49 2012 +0000
@@ -19,7 +19,7 @@
 @Entity
 @Table(name="GEWAESSER"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="NAME") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="NAME")
 )
 public class Gewaesser  implements java.io.Serializable {
 
@@ -50,65 +50,65 @@
        this.bezugspegels = bezugspegels;
        this.stations = stations;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="GEWAESSERID", unique=true, nullable=false, precision=11, scale=0)
     public long getGewaesserid() {
         return this.gewaesserid;
     }
-    
+
     public void setGewaesserid(long gewaesserid) {
         this.gewaesserid = gewaesserid;
     }
 
-    
+
     @Column(name="NAME", unique=true, nullable=false, length=20)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="KENNUNG", length=11)
     public String getKennung() {
         return this.kennung;
     }
-    
+
     public void setKennung(String kennung) {
         this.kennung = kennung;
     }
 
-    
+
     @Column(name="LAENGE", precision=7, scale=3)
     public BigDecimal getLaenge() {
         return this.laenge;
     }
-    
+
     public void setLaenge(BigDecimal laenge) {
         this.laenge = laenge;
     }
 
-    
+
     @Column(name="EINZUGSGEBIET", precision=10)
     public BigDecimal getEinzugsgebiet() {
         return this.einzugsgebiet;
     }
-    
+
     public void setEinzugsgebiet(BigDecimal einzugsgebiet) {
         this.einzugsgebiet = einzugsgebiet;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -117,7 +117,7 @@
     public Set<Bezugspegel> getBezugspegels() {
         return this.bezugspegels;
     }
-    
+
     public void setBezugspegels(Set<Bezugspegel> bezugspegels) {
         this.bezugspegels = bezugspegels;
     }
@@ -126,7 +126,7 @@
     public Set<Station> getStations() {
         return this.stations;
     }
-    
+
     public void setStations(Set<Station> stations) {
         this.stations = stations;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Gfaenger.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gfaenger.java	Fri Jun 15 09:20:49 2012 +0000
@@ -19,7 +19,7 @@
 @Entity
 @Table(name="GFAENGER"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="NAME") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="NAME")
 )
 public class Gfaenger  implements java.io.Serializable {
 
@@ -51,65 +51,65 @@
        this.bemerkung = bemerkung;
        this.messungs = messungs;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="GFAENGERID", unique=true, nullable=false, precision=11, scale=0)
     public long getGfaengerid() {
         return this.gfaengerid;
     }
-    
+
     public void setGfaengerid(long gfaengerid) {
         this.gfaengerid = gfaengerid;
     }
 
-    
+
     @Column(name="ISTAKTIV", nullable=false, precision=1, scale=0)
     public boolean isIstaktiv() {
         return this.istaktiv;
     }
-    
+
     public void setIstaktiv(boolean istaktiv) {
         this.istaktiv = istaktiv;
     }
 
-    
+
     @Column(name="NAME", unique=true, nullable=false, length=30)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="BREITE", nullable=false, precision=6, scale=3)
     public BigDecimal getBreite() {
         return this.breite;
     }
-    
+
     public void setBreite(BigDecimal breite) {
         this.breite = breite;
     }
 
-    
+
     @Column(name="MASCHENWEITE", nullable=false, precision=7, scale=4)
     public BigDecimal getMaschenweite() {
         return this.maschenweite;
     }
-    
+
     public void setMaschenweite(BigDecimal maschenweite) {
         this.maschenweite = maschenweite;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -118,7 +118,7 @@
     public Set<Messung> getMessungs() {
         return this.messungs;
     }
-    
+
     public void setMessungs(Set<Messung> messungs) {
         this.messungs = messungs;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Glotlinks.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Glotlinks.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,45 +27,45 @@
     public Glotlinks(GlotlinksId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="glotrechteid", column=@Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="uferabst", column=@Column(name="UFERABST", nullable=false, precision=8, scale=3) ), 
-        @AttributeOverride(name="tgeschiebe", column=@Column(name="TGESCHIEBE", precision=8, scale=3) ), 
-        @AttributeOverride(name="dm", column=@Column(name="DM", precision=7, scale=4) ), 
-        @AttributeOverride(name="sk", column=@Column(name="SK", precision=8, scale=3) ), 
-        @AttributeOverride(name="so", column=@Column(name="SO", precision=8, scale=3) ), 
-        @AttributeOverride(name="u", column=@Column(name="U", precision=8, scale=3) ), 
-        @AttributeOverride(name="d90", column=@Column(name="D90", precision=7, scale=4) ), 
-        @AttributeOverride(name="d84", column=@Column(name="D84", precision=7, scale=4) ), 
-        @AttributeOverride(name="d80", column=@Column(name="D80", precision=7, scale=4) ), 
-        @AttributeOverride(name="d75", column=@Column(name="D75", precision=7, scale=4) ), 
-        @AttributeOverride(name="d70", column=@Column(name="D70", precision=7, scale=4) ), 
-        @AttributeOverride(name="d60", column=@Column(name="D60", precision=7, scale=4) ), 
-        @AttributeOverride(name="d50", column=@Column(name="D50", precision=7, scale=4) ), 
-        @AttributeOverride(name="d40", column=@Column(name="D40", precision=7, scale=4) ), 
-        @AttributeOverride(name="d30", column=@Column(name="D30", precision=7, scale=4) ), 
-        @AttributeOverride(name="d25", column=@Column(name="D25", precision=7, scale=4) ), 
-        @AttributeOverride(name="d20", column=@Column(name="D20", precision=7, scale=4) ), 
-        @AttributeOverride(name="d16", column=@Column(name="D16", precision=7, scale=4) ), 
-        @AttributeOverride(name="d10", column=@Column(name="D10", precision=7, scale=4) ), 
-        @AttributeOverride(name="dmin", column=@Column(name="DMIN", precision=7, scale=4) ), 
-        @AttributeOverride(name="durchdmin", column=@Column(name="DURCHDMIN", precision=6, scale=3) ), 
-        @AttributeOverride(name="dmax", column=@Column(name="DMAX", precision=7, scale=4) ), 
-        @AttributeOverride(name="durchdmax", column=@Column(name="DURCHDMAX", precision=6, scale=3) ), 
-        @AttributeOverride(name="stdabw", column=@Column(name="STDABW", precision=8, scale=3) ), 
-        @AttributeOverride(name="stdfehler", column=@Column(name="STDFEHLER", precision=8, scale=3) ), 
-        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ), 
-        @AttributeOverride(name="uferablinks", column=@Column(name="UFERABLINKS", precision=8, scale=3) ), 
+        @AttributeOverride(name="glotrechteid", column=@Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="uferabst", column=@Column(name="UFERABST", nullable=false, precision=8, scale=3) ),
+        @AttributeOverride(name="tgeschiebe", column=@Column(name="TGESCHIEBE", precision=8, scale=3) ),
+        @AttributeOverride(name="dm", column=@Column(name="DM", precision=7, scale=4) ),
+        @AttributeOverride(name="sk", column=@Column(name="SK", precision=8, scale=3) ),
+        @AttributeOverride(name="so", column=@Column(name="SO", precision=8, scale=3) ),
+        @AttributeOverride(name="u", column=@Column(name="U", precision=8, scale=3) ),
+        @AttributeOverride(name="d90", column=@Column(name="D90", precision=7, scale=4) ),
+        @AttributeOverride(name="d84", column=@Column(name="D84", precision=7, scale=4) ),
+        @AttributeOverride(name="d80", column=@Column(name="D80", precision=7, scale=4) ),
+        @AttributeOverride(name="d75", column=@Column(name="D75", precision=7, scale=4) ),
+        @AttributeOverride(name="d70", column=@Column(name="D70", precision=7, scale=4) ),
+        @AttributeOverride(name="d60", column=@Column(name="D60", precision=7, scale=4) ),
+        @AttributeOverride(name="d50", column=@Column(name="D50", precision=7, scale=4) ),
+        @AttributeOverride(name="d40", column=@Column(name="D40", precision=7, scale=4) ),
+        @AttributeOverride(name="d30", column=@Column(name="D30", precision=7, scale=4) ),
+        @AttributeOverride(name="d25", column=@Column(name="D25", precision=7, scale=4) ),
+        @AttributeOverride(name="d20", column=@Column(name="D20", precision=7, scale=4) ),
+        @AttributeOverride(name="d16", column=@Column(name="D16", precision=7, scale=4) ),
+        @AttributeOverride(name="d10", column=@Column(name="D10", precision=7, scale=4) ),
+        @AttributeOverride(name="dmin", column=@Column(name="DMIN", precision=7, scale=4) ),
+        @AttributeOverride(name="durchdmin", column=@Column(name="DURCHDMIN", precision=6, scale=3) ),
+        @AttributeOverride(name="dmax", column=@Column(name="DMAX", precision=7, scale=4) ),
+        @AttributeOverride(name="durchdmax", column=@Column(name="DURCHDMAX", precision=6, scale=3) ),
+        @AttributeOverride(name="stdabw", column=@Column(name="STDABW", precision=8, scale=3) ),
+        @AttributeOverride(name="stdfehler", column=@Column(name="STDFEHLER", precision=8, scale=3) ),
+        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ),
+        @AttributeOverride(name="uferablinks", column=@Column(name="UFERABLINKS", precision=8, scale=3) ),
         @AttributeOverride(name="linksabst", column=@Column(name="LINKSABST", precision=22, scale=0) ) } )
     public GlotlinksId getId() {
         return this.id;
     }
-    
+
     public void setId(GlotlinksId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/GlotlinksId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/GlotlinksId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -47,7 +47,7 @@
     public GlotlinksId() {
     }
 
-    
+
     public GlotlinksId(long glotrechteid, long messungid, BigDecimal uferabst) {
         this.glotrechteid = glotrechteid;
         this.messungid = messungid;
@@ -85,14 +85,14 @@
        this.uferablinks = uferablinks;
        this.linksabst = linksabst;
     }
-   
+
 
 
     @Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0)
     public long getGlotrechteid() {
         return this.glotrechteid;
     }
-    
+
     public void setGlotrechteid(long glotrechteid) {
         this.glotrechteid = glotrechteid;
     }
@@ -102,7 +102,7 @@
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
@@ -112,7 +112,7 @@
     public BigDecimal getUferabst() {
         return this.uferabst;
     }
-    
+
     public void setUferabst(BigDecimal uferabst) {
         this.uferabst = uferabst;
     }
@@ -122,7 +122,7 @@
     public BigDecimal getTgeschiebe() {
         return this.tgeschiebe;
     }
-    
+
     public void setTgeschiebe(BigDecimal tgeschiebe) {
         this.tgeschiebe = tgeschiebe;
     }
@@ -132,7 +132,7 @@
     public BigDecimal getDm() {
         return this.dm;
     }
-    
+
     public void setDm(BigDecimal dm) {
         this.dm = dm;
     }
@@ -142,7 +142,7 @@
     public BigDecimal getSk() {
         return this.sk;
     }
-    
+
     public void setSk(BigDecimal sk) {
         this.sk = sk;
     }
@@ -152,7 +152,7 @@
     public BigDecimal getSo() {
         return this.so;
     }
-    
+
     public void setSo(BigDecimal so) {
         this.so = so;
     }
@@ -162,7 +162,7 @@
     public BigDecimal getU() {
         return this.u;
     }
-    
+
     public void setU(BigDecimal u) {
         this.u = u;
     }
@@ -172,7 +172,7 @@
     public BigDecimal getD90() {
         return this.d90;
     }
-    
+
     public void setD90(BigDecimal d90) {
         this.d90 = d90;
     }
@@ -182,7 +182,7 @@
     public BigDecimal getD84() {
         return this.d84;
     }
-    
+
     public void setD84(BigDecimal d84) {
         this.d84 = d84;
     }
@@ -192,7 +192,7 @@
     public BigDecimal getD80() {
         return this.d80;
     }
-    
+
     public void setD80(BigDecimal d80) {
         this.d80 = d80;
     }
@@ -202,7 +202,7 @@
     public BigDecimal getD75() {
         return this.d75;
     }
-    
+
     public void setD75(BigDecimal d75) {
         this.d75 = d75;
     }
@@ -212,7 +212,7 @@
     public BigDecimal getD70() {
         return this.d70;
     }
-    
+
     public void setD70(BigDecimal d70) {
         this.d70 = d70;
     }
@@ -222,7 +222,7 @@
     public BigDecimal getD60() {
         return this.d60;
     }
-    
+
     public void setD60(BigDecimal d60) {
         this.d60 = d60;
     }
@@ -232,7 +232,7 @@
     public BigDecimal getD50() {
         return this.d50;
     }
-    
+
     public void setD50(BigDecimal d50) {
         this.d50 = d50;
     }
@@ -242,7 +242,7 @@
     public BigDecimal getD40() {
         return this.d40;
     }
-    
+
     public void setD40(BigDecimal d40) {
         this.d40 = d40;
     }
@@ -252,7 +252,7 @@
     public BigDecimal getD30() {
         return this.d30;
     }
-    
+
     public void setD30(BigDecimal d30) {
         this.d30 = d30;
     }
@@ -262,7 +262,7 @@
     public BigDecimal getD25() {
         return this.d25;
     }
-    
+
     public void setD25(BigDecimal d25) {
         this.d25 = d25;
     }
@@ -272,7 +272,7 @@
     public BigDecimal getD20() {
         return this.d20;
     }
-    
+
     public void setD20(BigDecimal d20) {
         this.d20 = d20;
     }
@@ -282,7 +282,7 @@
     public BigDecimal getD16() {
         return this.d16;
     }
-    
+
     public void setD16(BigDecimal d16) {
         this.d16 = d16;
     }
@@ -292,7 +292,7 @@
     public BigDecimal getD10() {
         return this.d10;
     }
-    
+
     public void setD10(BigDecimal d10) {
         this.d10 = d10;
     }
@@ -302,7 +302,7 @@
     public BigDecimal getDmin() {
         return this.dmin;
     }
-    
+
     public void setDmin(BigDecimal dmin) {
         this.dmin = dmin;
     }
@@ -312,7 +312,7 @@
     public BigDecimal getDurchdmin() {
         return this.durchdmin;
     }
-    
+
     public void setDurchdmin(BigDecimal durchdmin) {
         this.durchdmin = durchdmin;
     }
@@ -322,7 +322,7 @@
     public BigDecimal getDmax() {
         return this.dmax;
     }
-    
+
     public void setDmax(BigDecimal dmax) {
         this.dmax = dmax;
     }
@@ -332,7 +332,7 @@
     public BigDecimal getDurchdmax() {
         return this.durchdmax;
     }
-    
+
     public void setDurchdmax(BigDecimal durchdmax) {
         this.durchdmax = durchdmax;
     }
@@ -342,7 +342,7 @@
     public BigDecimal getStdabw() {
         return this.stdabw;
     }
-    
+
     public void setStdabw(BigDecimal stdabw) {
         this.stdabw = stdabw;
     }
@@ -352,7 +352,7 @@
     public BigDecimal getStdfehler() {
         return this.stdfehler;
     }
-    
+
     public void setStdfehler(BigDecimal stdfehler) {
         this.stdfehler = stdfehler;
     }
@@ -362,7 +362,7 @@
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -372,7 +372,7 @@
     public BigDecimal getUferablinks() {
         return this.uferablinks;
     }
-    
+
     public void setUferablinks(BigDecimal uferablinks) {
         this.uferablinks = uferablinks;
     }
@@ -382,7 +382,7 @@
     public BigDecimal getLinksabst() {
         return this.linksabst;
     }
-    
+
     public void setLinksabst(BigDecimal linksabst) {
         this.linksabst = linksabst;
     }
@@ -392,8 +392,8 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof GlotlinksId) ) return false;
-         GlotlinksId castOther = ( GlotlinksId ) other; 
-         
+         GlotlinksId castOther = ( GlotlinksId ) other;
+
          return (this.getGlotrechteid()==castOther.getGlotrechteid())
  && (this.getMessungid()==castOther.getMessungid())
  && ( (this.getUferabst()==castOther.getUferabst()) || ( this.getUferabst()!=null && castOther.getUferabst()!=null && this.getUferabst().equals(castOther.getUferabst()) ) )
@@ -425,10 +425,10 @@
  && ( (this.getUferablinks()==castOther.getUferablinks()) || ( this.getUferablinks()!=null && castOther.getUferablinks()!=null && this.getUferablinks().equals(castOther.getUferablinks()) ) )
  && ( (this.getLinksabst()==castOther.getLinksabst()) || ( this.getLinksabst()!=null && castOther.getLinksabst()!=null && this.getLinksabst().equals(castOther.getLinksabst()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getGlotrechteid();
          result = 37 * result + (int) this.getMessungid();
          result = 37 * result + ( getUferabst() == null ? 0 : this.getUferabst().hashCode() );
@@ -460,5 +460,5 @@
          result = 37 * result + ( getUferablinks() == null ? 0 : this.getUferablinks().hashCode() );
          result = 37 * result + ( getLinksabst() == null ? 0 : this.getLinksabst().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Glotrechte.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Glotrechte.java	Fri Jun 15 09:20:49 2012 +0000
@@ -60,7 +60,7 @@
     public Glotrechte() {
     }
 
-	
+
     public Glotrechte(long glotrechteid, Messung messung, BigDecimal uferabst) {
         this.glotrechteid = glotrechteid;
         this.messung = messung;
@@ -99,15 +99,15 @@
        this.gsiebung = gsiebung;
        this.gprobes = gprobes;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="GLOTRECHTEID", unique=true, nullable=false, precision=11, scale=0)
     public long getGlotrechteid() {
         return this.glotrechteid;
     }
-    
+
     public void setGlotrechteid(long glotrechteid) {
         this.glotrechteid = glotrechteid;
     }
@@ -117,277 +117,277 @@
     public Messung getMessung() {
         return this.messung;
     }
-    
+
     public void setMessung(Messung messung) {
         this.messung = messung;
     }
 
-    
+
     @Column(name="UFERABST", nullable=false, precision=8, scale=3)
     public BigDecimal getUferabst() {
         return this.uferabst;
     }
-    
+
     public void setUferabst(BigDecimal uferabst) {
         this.uferabst = uferabst;
     }
 
-    
+
     @Column(name="TGESCHIEBE", precision=8, scale=3)
     public BigDecimal getTgeschiebe() {
         return this.tgeschiebe;
     }
-    
+
     public void setTgeschiebe(BigDecimal tgeschiebe) {
         this.tgeschiebe = tgeschiebe;
     }
 
-    
+
     @Column(name="DM", precision=7, scale=4)
     public BigDecimal getDm() {
         return this.dm;
     }
-    
+
     public void setDm(BigDecimal dm) {
         this.dm = dm;
     }
 
-    
+
     @Column(name="SK", precision=8, scale=3)
     public BigDecimal getSk() {
         return this.sk;
     }
-    
+
     public void setSk(BigDecimal sk) {
         this.sk = sk;
     }
 
-    
+
     @Column(name="SO", precision=8, scale=3)
     public BigDecimal getSo() {
         return this.so;
     }
-    
+
     public void setSo(BigDecimal so) {
         this.so = so;
     }
 
-    
+
     @Column(name="U", precision=8, scale=3)
     public BigDecimal getU() {
         return this.u;
     }
-    
+
     public void setU(BigDecimal u) {
         this.u = u;
     }
 
-    
+
     @Column(name="D90", precision=7, scale=4)
     public BigDecimal getD90() {
         return this.d90;
     }
-    
+
     public void setD90(BigDecimal d90) {
         this.d90 = d90;
     }
 
-    
+
     @Column(name="D84", precision=7, scale=4)
     public BigDecimal getD84() {
         return this.d84;
     }
-    
+
     public void setD84(BigDecimal d84) {
         this.d84 = d84;
     }
 
-    
+
     @Column(name="D80", precision=7, scale=4)
     public BigDecimal getD80() {
         return this.d80;
     }
-    
+
     public void setD80(BigDecimal d80) {
         this.d80 = d80;
     }
 
-    
+
     @Column(name="D75", precision=7, scale=4)
     public BigDecimal getD75() {
         return this.d75;
     }
-    
+
     public void setD75(BigDecimal d75) {
         this.d75 = d75;
     }
 
-    
+
     @Column(name="D70", precision=7, scale=4)
     public BigDecimal getD70() {
         return this.d70;
     }
-    
+
     public void setD70(BigDecimal d70) {
         this.d70 = d70;
     }
 
-    
+
     @Column(name="D60", precision=7, scale=4)
     public BigDecimal getD60() {
         return this.d60;
     }
-    
+
     public void setD60(BigDecimal d60) {
         this.d60 = d60;
     }
 
-    
+
     @Column(name="D50", precision=7, scale=4)
     public BigDecimal getD50() {
         return this.d50;
     }
-    
+
     public void setD50(BigDecimal d50) {
         this.d50 = d50;
     }
 
-    
+
     @Column(name="D40", precision=7, scale=4)
     public BigDecimal getD40() {
         return this.d40;
     }
-    
+
     public void setD40(BigDecimal d40) {
         this.d40 = d40;
     }
 
-    
+
     @Column(name="D30", precision=7, scale=4)
     public BigDecimal getD30() {
         return this.d30;
     }
-    
+
     public void setD30(BigDecimal d30) {
         this.d30 = d30;
     }
 
-    
+
     @Column(name="D25", precision=7, scale=4)
     public BigDecimal getD25() {
         return this.d25;
     }
-    
+
     public void setD25(BigDecimal d25) {
         this.d25 = d25;
     }
 
-    
+
     @Column(name="D20", precision=7, scale=4)
     public BigDecimal getD20() {
         return this.d20;
     }
-    
+
     public void setD20(BigDecimal d20) {
         this.d20 = d20;
     }
 
-    
+
     @Column(name="D16", precision=7, scale=4)
     public BigDecimal getD16() {
         return this.d16;
     }
-    
+
     public void setD16(BigDecimal d16) {
         this.d16 = d16;
     }
 
-    
+
     @Column(name="D10", precision=7, scale=4)
     public BigDecimal getD10() {
         return this.d10;
     }
-    
+
     public void setD10(BigDecimal d10) {
         this.d10 = d10;
     }
 
-    
+
     @Column(name="DMIN", precision=7, scale=4)
     public BigDecimal getDmin() {
         return this.dmin;
     }
-    
+
     public void setDmin(BigDecimal dmin) {
         this.dmin = dmin;
     }
 
-    
+
     @Column(name="DURCHDMIN", precision=6, scale=3)
     public BigDecimal getDurchdmin() {
         return this.durchdmin;
     }
-    
+
     public void setDurchdmin(BigDecimal durchdmin) {
         this.durchdmin = durchdmin;
     }
 
-    
+
     @Column(name="DMAX", precision=7, scale=4)
     public BigDecimal getDmax() {
         return this.dmax;
     }
-    
+
     public void setDmax(BigDecimal dmax) {
         this.dmax = dmax;
     }
 
-    
+
     @Column(name="DURCHDMAX", precision=6, scale=3)
     public BigDecimal getDurchdmax() {
         return this.durchdmax;
     }
-    
+
     public void setDurchdmax(BigDecimal durchdmax) {
         this.durchdmax = durchdmax;
     }
 
-    
+
     @Column(name="STDABW", precision=8, scale=3)
     public BigDecimal getStdabw() {
         return this.stdabw;
     }
-    
+
     public void setStdabw(BigDecimal stdabw) {
         this.stdabw = stdabw;
     }
 
-    
+
     @Column(name="STDFEHLER", precision=8, scale=3)
     public BigDecimal getStdfehler() {
         return this.stdfehler;
     }
-    
+
     public void setStdfehler(BigDecimal stdfehler) {
         this.stdfehler = stdfehler;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
 
-    
+
     @Column(name="UFERABLINKS", precision=8, scale=3)
     public BigDecimal getUferablinks() {
         return this.uferablinks;
     }
-    
+
     public void setUferablinks(BigDecimal uferablinks) {
         this.uferablinks = uferablinks;
     }
@@ -396,7 +396,7 @@
     public Gsiebung getGsiebung() {
         return this.gsiebung;
     }
-    
+
     public void setGsiebung(Gsiebung gsiebung) {
         this.gsiebung = gsiebung;
     }
@@ -405,7 +405,7 @@
     public Set<Gprobe> getGprobes() {
         return this.gprobes;
     }
-    
+
     public void setGprobes(Set<Gprobe> gprobes) {
         this.gprobes = gprobes;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Gprobe.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gprobe.java	Fri Jun 15 09:20:49 2012 +0000
@@ -51,17 +51,17 @@
        this.mengeF = mengeF;
        this.gtriebF = gtriebF;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="glotrechteid", column=@Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0) ), 
+        @AttributeOverride(name="glotrechteid", column=@Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0) ),
         @AttributeOverride(name="lfdnr", column=@Column(name="LFDNR", nullable=false, precision=5, scale=0) ) } )
     public GprobeId getId() {
         return this.id;
     }
-    
+
     public void setId(GprobeId id) {
         this.id = id;
     }
@@ -71,67 +71,67 @@
     public Glotrechte getGlotrechte() {
         return this.glotrechte;
     }
-    
+
     public void setGlotrechte(Glotrechte glotrechte) {
         this.glotrechte = glotrechte;
     }
 
-    
+
     @Column(name="MESSDAUER", nullable=false, precision=5, scale=0)
     public int getMessdauer() {
         return this.messdauer;
     }
-    
+
     public void setMessdauer(int messdauer) {
         this.messdauer = messdauer;
     }
 
-    
+
     @Column(name="MENGE", nullable=false, precision=9, scale=3)
     public BigDecimal getMenge() {
         return this.menge;
     }
-    
+
     public void setMenge(BigDecimal menge) {
         this.menge = menge;
     }
 
-    
+
     @Column(name="GTRIEB", precision=8, scale=3)
     public BigDecimal getGtrieb() {
         return this.gtrieb;
     }
-    
+
     public void setGtrieb(BigDecimal gtrieb) {
         this.gtrieb = gtrieb;
     }
 
-    
+
     @Column(name="FAKTOR", precision=4, scale=3)
     public BigDecimal getFaktor() {
         return this.faktor;
     }
-    
+
     public void setFaktor(BigDecimal faktor) {
         this.faktor = faktor;
     }
 
-    
+
     @Column(name="MENGE_F", precision=9, scale=3)
     public BigDecimal getMengeF() {
         return this.mengeF;
     }
-    
+
     public void setMengeF(BigDecimal mengeF) {
         this.mengeF = mengeF;
     }
 
-    
+
     @Column(name="GTRIEB_F", precision=8, scale=3)
     public BigDecimal getGtriebF() {
         return this.gtriebF;
     }
-    
+
     public void setGtriebF(BigDecimal gtriebF) {
         this.gtriebF = gtriebF;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/GprobeId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/GprobeId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -22,14 +22,14 @@
        this.glotrechteid = glotrechteid;
        this.lfdnr = lfdnr;
     }
-   
+
 
 
     @Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0)
     public long getGlotrechteid() {
         return this.glotrechteid;
     }
-    
+
     public void setGlotrechteid(long glotrechteid) {
         this.glotrechteid = glotrechteid;
     }
@@ -39,7 +39,7 @@
     public int getLfdnr() {
         return this.lfdnr;
     }
-    
+
     public void setLfdnr(int lfdnr) {
         this.lfdnr = lfdnr;
     }
@@ -49,17 +49,17 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof GprobeId) ) return false;
-         GprobeId castOther = ( GprobeId ) other; 
-         
+         GprobeId castOther = ( GprobeId ) other;
+
          return (this.getGlotrechteid()==castOther.getGlotrechteid())
  && (this.getLfdnr()==castOther.getLfdnr());
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getGlotrechteid();
          result = 37 * result + this.getLfdnr();
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebsatz.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebsatz.java	Fri Jun 15 09:20:49 2012 +0000
@@ -19,7 +19,7 @@
 @Entity
 @Table(name="GSIEBSATZ"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="NAME") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="NAME")
 )
 public class Gsiebsatz  implements java.io.Serializable {
 
@@ -55,7 +55,7 @@
     public Gsiebsatz() {
     }
 
-	
+
     public Gsiebsatz(long gsiebsatzid, String name, boolean istaktiv) {
         this.gsiebsatzid = gsiebsatzid;
         this.name = name;
@@ -90,255 +90,255 @@
        this.ssiebungs = ssiebungs;
        this.messungs = messungs;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="GSIEBSATZID", unique=true, nullable=false, precision=11, scale=0)
     public long getGsiebsatzid() {
         return this.gsiebsatzid;
     }
-    
+
     public void setGsiebsatzid(long gsiebsatzid) {
         this.gsiebsatzid = gsiebsatzid;
     }
 
-    
+
     @Column(name="NAME", unique=true, nullable=false, length=20)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="ISTAKTIV", nullable=false, precision=1, scale=0)
     public boolean isIstaktiv() {
         return this.istaktiv;
     }
-    
+
     public void setIstaktiv(boolean istaktiv) {
         this.istaktiv = istaktiv;
     }
 
-    
+
     @Column(name="SIEB01", precision=7, scale=4)
     public BigDecimal getSieb01() {
         return this.sieb01;
     }
-    
+
     public void setSieb01(BigDecimal sieb01) {
         this.sieb01 = sieb01;
     }
 
-    
+
     @Column(name="SIEB02", precision=7, scale=4)
     public BigDecimal getSieb02() {
         return this.sieb02;
     }
-    
+
     public void setSieb02(BigDecimal sieb02) {
         this.sieb02 = sieb02;
     }
 
-    
+
     @Column(name="SIEB03", precision=7, scale=4)
     public BigDecimal getSieb03() {
         return this.sieb03;
     }
-    
+
     public void setSieb03(BigDecimal sieb03) {
         this.sieb03 = sieb03;
     }
 
-    
+
     @Column(name="SIEB04", precision=7, scale=4)
     public BigDecimal getSieb04() {
         return this.sieb04;
     }
-    
+
     public void setSieb04(BigDecimal sieb04) {
         this.sieb04 = sieb04;
     }
 
-    
+
     @Column(name="SIEB05", precision=7, scale=4)
     public BigDecimal getSieb05() {
         return this.sieb05;
     }
-    
+
     public void setSieb05(BigDecimal sieb05) {
         this.sieb05 = sieb05;
     }
 
-    
+
     @Column(name="SIEB06", precision=7, scale=4)
     public BigDecimal getSieb06() {
         return this.sieb06;
     }
-    
+
     public void setSieb06(BigDecimal sieb06) {
         this.sieb06 = sieb06;
     }
 
-    
+
     @Column(name="SIEB07", precision=7, scale=4)
     public BigDecimal getSieb07() {
         return this.sieb07;
     }
-    
+
     public void setSieb07(BigDecimal sieb07) {
         this.sieb07 = sieb07;
     }
 
-    
+
     @Column(name="SIEB08", precision=7, scale=4)
     public BigDecimal getSieb08() {
         return this.sieb08;
     }
-    
+
     public void setSieb08(BigDecimal sieb08) {
         this.sieb08 = sieb08;
     }
 
-    
+
     @Column(name="SIEB09", precision=7, scale=4)
     public BigDecimal getSieb09() {
         return this.sieb09;
     }
-    
+
     public void setSieb09(BigDecimal sieb09) {
         this.sieb09 = sieb09;
     }
 
-    
+
     @Column(name="SIEB10", precision=7, scale=4)
     public BigDecimal getSieb10() {
         return this.sieb10;
     }
-    
+
     public void setSieb10(BigDecimal sieb10) {
         this.sieb10 = sieb10;
     }
 
-    
+
     @Column(name="SIEB11", precision=7, scale=4)
     public BigDecimal getSieb11() {
         return this.sieb11;
     }
-    
+
     public void setSieb11(BigDecimal sieb11) {
         this.sieb11 = sieb11;
     }
 
-    
+
     @Column(name="SIEB12", precision=7, scale=4)
     public BigDecimal getSieb12() {
         return this.sieb12;
     }
-    
+
     public void setSieb12(BigDecimal sieb12) {
         this.sieb12 = sieb12;
     }
 
-    
+
     @Column(name="SIEB13", precision=7, scale=4)
     public BigDecimal getSieb13() {
         return this.sieb13;
     }
-    
+
     public void setSieb13(BigDecimal sieb13) {
         this.sieb13 = sieb13;
     }
 
-    
+
     @Column(name="SIEB14", precision=7, scale=4)
     public BigDecimal getSieb14() {
         return this.sieb14;
     }
-    
+
     public void setSieb14(BigDecimal sieb14) {
         this.sieb14 = sieb14;
     }
 
-    
+
     @Column(name="SIEB15", precision=7, scale=4)
     public BigDecimal getSieb15() {
         return this.sieb15;
     }
-    
+
     public void setSieb15(BigDecimal sieb15) {
         this.sieb15 = sieb15;
     }
 
-    
+
     @Column(name="SIEB16", precision=7, scale=4)
     public BigDecimal getSieb16() {
         return this.sieb16;
     }
-    
+
     public void setSieb16(BigDecimal sieb16) {
         this.sieb16 = sieb16;
     }
 
-    
+
     @Column(name="SIEB17", precision=7, scale=4)
     public BigDecimal getSieb17() {
         return this.sieb17;
     }
-    
+
     public void setSieb17(BigDecimal sieb17) {
         this.sieb17 = sieb17;
     }
 
-    
+
     @Column(name="SIEB18", precision=7, scale=4)
     public BigDecimal getSieb18() {
         return this.sieb18;
     }
-    
+
     public void setSieb18(BigDecimal sieb18) {
         this.sieb18 = sieb18;
     }
 
-    
+
     @Column(name="SIEB19", precision=7, scale=4)
     public BigDecimal getSieb19() {
         return this.sieb19;
     }
-    
+
     public void setSieb19(BigDecimal sieb19) {
         this.sieb19 = sieb19;
     }
 
-    
+
     @Column(name="SIEB20", precision=7, scale=4)
     public BigDecimal getSieb20() {
         return this.sieb20;
     }
-    
+
     public void setSieb20(BigDecimal sieb20) {
         this.sieb20 = sieb20;
     }
 
-    
+
     @Column(name="SIEB21", precision=7, scale=4)
     public BigDecimal getSieb21() {
         return this.sieb21;
     }
-    
+
     public void setSieb21(BigDecimal sieb21) {
         this.sieb21 = sieb21;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -347,7 +347,7 @@
     public Set<Ssiebung> getSsiebungs() {
         return this.ssiebungs;
     }
-    
+
     public void setSsiebungs(Set<Ssiebung> ssiebungs) {
         this.ssiebungs = ssiebungs;
     }
@@ -356,7 +356,7 @@
     public Set<Messung> getMessungs() {
         return this.messungs;
     }
-    
+
     public void setMessungs(Set<Messung> messungs) {
         this.messungs = messungs;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebung.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebung.java	Fri Jun 15 09:20:49 2012 +0000
@@ -84,15 +84,15 @@
        this.rest = rest;
        this.bemerkung = bemerkung;
     }
-   
+
      @GenericGenerator(name="generator", strategy="foreign", parameters=@Parameter(name="property", value="glotrechte"))@Id @GeneratedValue(generator="generator")
 
-    
+
     @Column(name="GLOTRECHTEID", unique=true, nullable=false, precision=11, scale=0)
     public long getGlotrechteid() {
         return this.glotrechteid;
     }
-    
+
     public void setGlotrechteid(long glotrechteid) {
         this.glotrechteid = glotrechteid;
     }
@@ -101,247 +101,247 @@
     public Glotrechte getGlotrechte() {
         return this.glotrechte;
     }
-    
+
     public void setGlotrechte(Glotrechte glotrechte) {
         this.glotrechte = glotrechte;
     }
 
-    
+
     @Column(name="GMASSE", precision=9, scale=3)
     public BigDecimal getGmasse() {
         return this.gmasse;
     }
-    
+
     public void setGmasse(BigDecimal gmasse) {
         this.gmasse = gmasse;
     }
 
-    
+
     @Column(name="RSIEB01", precision=9, scale=3)
     public BigDecimal getRsieb01() {
         return this.rsieb01;
     }
-    
+
     public void setRsieb01(BigDecimal rsieb01) {
         this.rsieb01 = rsieb01;
     }
 
-    
+
     @Column(name="RSIEB02", precision=9, scale=3)
     public BigDecimal getRsieb02() {
         return this.rsieb02;
     }
-    
+
     public void setRsieb02(BigDecimal rsieb02) {
         this.rsieb02 = rsieb02;
     }
 
-    
+
     @Column(name="RSIEB03", precision=9, scale=3)
     public BigDecimal getRsieb03() {
         return this.rsieb03;
     }
-    
+
     public void setRsieb03(BigDecimal rsieb03) {
         this.rsieb03 = rsieb03;
     }
 
-    
+
     @Column(name="RSIEB04", precision=9, scale=3)
     public BigDecimal getRsieb04() {
         return this.rsieb04;
     }
-    
+
     public void setRsieb04(BigDecimal rsieb04) {
         this.rsieb04 = rsieb04;
     }
 
-    
+
     @Column(name="RSIEB05", precision=9, scale=3)
     public BigDecimal getRsieb05() {
         return this.rsieb05;
     }
-    
+
     public void setRsieb05(BigDecimal rsieb05) {
         this.rsieb05 = rsieb05;
     }
 
-    
+
     @Column(name="RSIEB06", precision=9, scale=3)
     public BigDecimal getRsieb06() {
         return this.rsieb06;
     }
-    
+
     public void setRsieb06(BigDecimal rsieb06) {
         this.rsieb06 = rsieb06;
     }
 
-    
+
     @Column(name="RSIEB07", precision=9, scale=3)
     public BigDecimal getRsieb07() {
         return this.rsieb07;
     }
-    
+
     public void setRsieb07(BigDecimal rsieb07) {
         this.rsieb07 = rsieb07;
     }
 
-    
+
     @Column(name="RSIEB08", precision=9, scale=3)
     public BigDecimal getRsieb08() {
         return this.rsieb08;
     }
-    
+
     public void setRsieb08(BigDecimal rsieb08) {
         this.rsieb08 = rsieb08;
     }
 
-    
+
     @Column(name="RSIEB09", precision=9, scale=3)
     public BigDecimal getRsieb09() {
         return this.rsieb09;
     }
-    
+
     public void setRsieb09(BigDecimal rsieb09) {
         this.rsieb09 = rsieb09;
     }
 
-    
+
     @Column(name="RSIEB10", precision=9, scale=3)
     public BigDecimal getRsieb10() {
         return this.rsieb10;
     }
-    
+
     public void setRsieb10(BigDecimal rsieb10) {
         this.rsieb10 = rsieb10;
     }
 
-    
+
     @Column(name="RSIEB11", precision=9, scale=3)
     public BigDecimal getRsieb11() {
         return this.rsieb11;
     }
-    
+
     public void setRsieb11(BigDecimal rsieb11) {
         this.rsieb11 = rsieb11;
     }
 
-    
+
     @Column(name="RSIEB12", precision=9, scale=3)
     public BigDecimal getRsieb12() {
         return this.rsieb12;
     }
-    
+
     public void setRsieb12(BigDecimal rsieb12) {
         this.rsieb12 = rsieb12;
     }
 
-    
+
     @Column(name="RSIEB13", precision=9, scale=3)
     public BigDecimal getRsieb13() {
         return this.rsieb13;
     }
-    
+
     public void setRsieb13(BigDecimal rsieb13) {
         this.rsieb13 = rsieb13;
     }
 
-    
+
     @Column(name="RSIEB14", precision=9, scale=3)
     public BigDecimal getRsieb14() {
         return this.rsieb14;
     }
-    
+
     public void setRsieb14(BigDecimal rsieb14) {
         this.rsieb14 = rsieb14;
     }
 
-    
+
     @Column(name="RSIEB15", precision=9, scale=3)
     public BigDecimal getRsieb15() {
         return this.rsieb15;
     }
-    
+
     public void setRsieb15(BigDecimal rsieb15) {
         this.rsieb15 = rsieb15;
     }
 
-    
+
     @Column(name="RSIEB16", precision=9, scale=3)
     public BigDecimal getRsieb16() {
         return this.rsieb16;
     }
-    
+
     public void setRsieb16(BigDecimal rsieb16) {
         this.rsieb16 = rsieb16;
     }
 
-    
+
     @Column(name="RSIEB17", precision=9, scale=3)
     public BigDecimal getRsieb17() {
         return this.rsieb17;
     }
-    
+
     public void setRsieb17(BigDecimal rsieb17) {
         this.rsieb17 = rsieb17;
     }
 
-    
+
     @Column(name="RSIEB18", precision=9, scale=3)
     public BigDecimal getRsieb18() {
         return this.rsieb18;
     }
-    
+
     public void setRsieb18(BigDecimal rsieb18) {
         this.rsieb18 = rsieb18;
     }
 
-    
+
     @Column(name="RSIEB19", precision=9, scale=3)
     public BigDecimal getRsieb19() {
         return this.rsieb19;
     }
-    
+
     public void setRsieb19(BigDecimal rsieb19) {
         this.rsieb19 = rsieb19;
     }
 
-    
+
     @Column(name="RSIEB20", precision=9, scale=3)
     public BigDecimal getRsieb20() {
         return this.rsieb20;
     }
-    
+
     public void setRsieb20(BigDecimal rsieb20) {
         this.rsieb20 = rsieb20;
     }
 
-    
+
     @Column(name="RSIEB21", precision=9, scale=3)
     public BigDecimal getRsieb21() {
         return this.rsieb21;
     }
-    
+
     public void setRsieb21(BigDecimal rsieb21) {
         this.rsieb21 = rsieb21;
     }
 
-    
+
     @Column(name="REST", precision=9, scale=3)
     public BigDecimal getRest() {
         return this.rest;
     }
-    
+
     public void setRest(BigDecimal rest) {
         this.rest = rest;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebungsieb.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Gsiebungsieb.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,61 +27,61 @@
     public Gsiebungsieb(GsiebungsiebId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="glotrechteid", column=@Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="gsiebsatzid", column=@Column(name="GSIEBSATZID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="gmasse", column=@Column(name="GMASSE", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche01", column=@Column(name="MASCHE01", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck01", column=@Column(name="RUECK01", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche02", column=@Column(name="MASCHE02", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck02", column=@Column(name="RUECK02", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche03", column=@Column(name="MASCHE03", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck03", column=@Column(name="RUECK03", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche04", column=@Column(name="MASCHE04", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck04", column=@Column(name="RUECK04", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche05", column=@Column(name="MASCHE05", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck05", column=@Column(name="RUECK05", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche06", column=@Column(name="MASCHE06", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck06", column=@Column(name="RUECK06", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche07", column=@Column(name="MASCHE07", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck07", column=@Column(name="RUECK07", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche08", column=@Column(name="MASCHE08", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck08", column=@Column(name="RUECK08", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche09", column=@Column(name="MASCHE09", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck09", column=@Column(name="RUECK09", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche10", column=@Column(name="MASCHE10", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck10", column=@Column(name="RUECK10", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche11", column=@Column(name="MASCHE11", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck11", column=@Column(name="RUECK11", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche12", column=@Column(name="MASCHE12", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck12", column=@Column(name="RUECK12", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche13", column=@Column(name="MASCHE13", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck13", column=@Column(name="RUECK13", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche14", column=@Column(name="MASCHE14", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck14", column=@Column(name="RUECK14", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche15", column=@Column(name="MASCHE15", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck15", column=@Column(name="RUECK15", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche16", column=@Column(name="MASCHE16", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck16", column=@Column(name="RUECK16", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche17", column=@Column(name="MASCHE17", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck17", column=@Column(name="RUECK17", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche18", column=@Column(name="MASCHE18", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck18", column=@Column(name="RUECK18", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche19", column=@Column(name="MASCHE19", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck19", column=@Column(name="RUECK19", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche20", column=@Column(name="MASCHE20", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck20", column=@Column(name="RUECK20", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche21", column=@Column(name="MASCHE21", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck21", column=@Column(name="RUECK21", precision=9, scale=3) ), 
+        @AttributeOverride(name="glotrechteid", column=@Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="gsiebsatzid", column=@Column(name="GSIEBSATZID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="gmasse", column=@Column(name="GMASSE", precision=9, scale=3) ),
+        @AttributeOverride(name="masche01", column=@Column(name="MASCHE01", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck01", column=@Column(name="RUECK01", precision=9, scale=3) ),
+        @AttributeOverride(name="masche02", column=@Column(name="MASCHE02", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck02", column=@Column(name="RUECK02", precision=9, scale=3) ),
+        @AttributeOverride(name="masche03", column=@Column(name="MASCHE03", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck03", column=@Column(name="RUECK03", precision=9, scale=3) ),
+        @AttributeOverride(name="masche04", column=@Column(name="MASCHE04", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck04", column=@Column(name="RUECK04", precision=9, scale=3) ),
+        @AttributeOverride(name="masche05", column=@Column(name="MASCHE05", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck05", column=@Column(name="RUECK05", precision=9, scale=3) ),
+        @AttributeOverride(name="masche06", column=@Column(name="MASCHE06", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck06", column=@Column(name="RUECK06", precision=9, scale=3) ),
+        @AttributeOverride(name="masche07", column=@Column(name="MASCHE07", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck07", column=@Column(name="RUECK07", precision=9, scale=3) ),
+        @AttributeOverride(name="masche08", column=@Column(name="MASCHE08", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck08", column=@Column(name="RUECK08", precision=9, scale=3) ),
+        @AttributeOverride(name="masche09", column=@Column(name="MASCHE09", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck09", column=@Column(name="RUECK09", precision=9, scale=3) ),
+        @AttributeOverride(name="masche10", column=@Column(name="MASCHE10", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck10", column=@Column(name="RUECK10", precision=9, scale=3) ),
+        @AttributeOverride(name="masche11", column=@Column(name="MASCHE11", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck11", column=@Column(name="RUECK11", precision=9, scale=3) ),
+        @AttributeOverride(name="masche12", column=@Column(name="MASCHE12", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck12", column=@Column(name="RUECK12", precision=9, scale=3) ),
+        @AttributeOverride(name="masche13", column=@Column(name="MASCHE13", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck13", column=@Column(name="RUECK13", precision=9, scale=3) ),
+        @AttributeOverride(name="masche14", column=@Column(name="MASCHE14", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck14", column=@Column(name="RUECK14", precision=9, scale=3) ),
+        @AttributeOverride(name="masche15", column=@Column(name="MASCHE15", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck15", column=@Column(name="RUECK15", precision=9, scale=3) ),
+        @AttributeOverride(name="masche16", column=@Column(name="MASCHE16", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck16", column=@Column(name="RUECK16", precision=9, scale=3) ),
+        @AttributeOverride(name="masche17", column=@Column(name="MASCHE17", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck17", column=@Column(name="RUECK17", precision=9, scale=3) ),
+        @AttributeOverride(name="masche18", column=@Column(name="MASCHE18", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck18", column=@Column(name="RUECK18", precision=9, scale=3) ),
+        @AttributeOverride(name="masche19", column=@Column(name="MASCHE19", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck19", column=@Column(name="RUECK19", precision=9, scale=3) ),
+        @AttributeOverride(name="masche20", column=@Column(name="MASCHE20", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck20", column=@Column(name="RUECK20", precision=9, scale=3) ),
+        @AttributeOverride(name="masche21", column=@Column(name="MASCHE21", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck21", column=@Column(name="RUECK21", precision=9, scale=3) ),
         @AttributeOverride(name="rest", column=@Column(name="REST", precision=9, scale=3) ) } )
     public GsiebungsiebId getId() {
         return this.id;
     }
-    
+
     public void setId(GsiebungsiebId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/GsiebungsiebId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/GsiebungsiebId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -63,7 +63,7 @@
     public GsiebungsiebId() {
     }
 
-    
+
     public GsiebungsiebId(long glotrechteid, long gsiebsatzid) {
         this.glotrechteid = glotrechteid;
         this.gsiebsatzid = gsiebsatzid;
@@ -116,14 +116,14 @@
        this.rueck21 = rueck21;
        this.rest = rest;
     }
-   
+
 
 
     @Column(name="GLOTRECHTEID", nullable=false, precision=11, scale=0)
     public long getGlotrechteid() {
         return this.glotrechteid;
     }
-    
+
     public void setGlotrechteid(long glotrechteid) {
         this.glotrechteid = glotrechteid;
     }
@@ -133,7 +133,7 @@
     public long getGsiebsatzid() {
         return this.gsiebsatzid;
     }
-    
+
     public void setGsiebsatzid(long gsiebsatzid) {
         this.gsiebsatzid = gsiebsatzid;
     }
@@ -143,7 +143,7 @@
     public BigDecimal getGmasse() {
         return this.gmasse;
     }
-    
+
     public void setGmasse(BigDecimal gmasse) {
         this.gmasse = gmasse;
     }
@@ -153,7 +153,7 @@
     public BigDecimal getMasche01() {
         return this.masche01;
     }
-    
+
     public void setMasche01(BigDecimal masche01) {
         this.masche01 = masche01;
     }
@@ -163,7 +163,7 @@
     public BigDecimal getRueck01() {
         return this.rueck01;
     }
-    
+
     public void setRueck01(BigDecimal rueck01) {
         this.rueck01 = rueck01;
     }
@@ -173,7 +173,7 @@
     public BigDecimal getMasche02() {
         return this.masche02;
     }
-    
+
     public void setMasche02(BigDecimal masche02) {
         this.masche02 = masche02;
     }
@@ -183,7 +183,7 @@
     public BigDecimal getRueck02() {
         return this.rueck02;
     }
-    
+
     public void setRueck02(BigDecimal rueck02) {
         this.rueck02 = rueck02;
     }
@@ -193,7 +193,7 @@
     public BigDecimal getMasche03() {
         return this.masche03;
     }
-    
+
     public void setMasche03(BigDecimal masche03) {
         this.masche03 = masche03;
     }
@@ -203,7 +203,7 @@
     public BigDecimal getRueck03() {
         return this.rueck03;
     }
-    
+
     public void setRueck03(BigDecimal rueck03) {
         this.rueck03 = rueck03;
     }
@@ -213,7 +213,7 @@
     public BigDecimal getMasche04() {
         return this.masche04;
     }
-    
+
     public void setMasche04(BigDecimal masche04) {
         this.masche04 = masche04;
     }
@@ -223,7 +223,7 @@
     public BigDecimal getRueck04() {
         return this.rueck04;
     }
-    
+
     public void setRueck04(BigDecimal rueck04) {
         this.rueck04 = rueck04;
     }
@@ -233,7 +233,7 @@
     public BigDecimal getMasche05() {
         return this.masche05;
     }
-    
+
     public void setMasche05(BigDecimal masche05) {
         this.masche05 = masche05;
     }
@@ -243,7 +243,7 @@
     public BigDecimal getRueck05() {
         return this.rueck05;
     }
-    
+
     public void setRueck05(BigDecimal rueck05) {
         this.rueck05 = rueck05;
     }
@@ -253,7 +253,7 @@
     public BigDecimal getMasche06() {
         return this.masche06;
     }
-    
+
     public void setMasche06(BigDecimal masche06) {
         this.masche06 = masche06;
     }
@@ -263,7 +263,7 @@
     public BigDecimal getRueck06() {
         return this.rueck06;
     }
-    
+
     public void setRueck06(BigDecimal rueck06) {
         this.rueck06 = rueck06;
     }
@@ -273,7 +273,7 @@
     public BigDecimal getMasche07() {
         return this.masche07;
     }
-    
+
     public void setMasche07(BigDecimal masche07) {
         this.masche07 = masche07;
     }
@@ -283,7 +283,7 @@
     public BigDecimal getRueck07() {
         return this.rueck07;
     }
-    
+
     public void setRueck07(BigDecimal rueck07) {
         this.rueck07 = rueck07;
     }
@@ -293,7 +293,7 @@
     public BigDecimal getMasche08() {
         return this.masche08;
     }
-    
+
     public void setMasche08(BigDecimal masche08) {
         this.masche08 = masche08;
     }
@@ -303,7 +303,7 @@
     public BigDecimal getRueck08() {
         return this.rueck08;
     }
-    
+
     public void setRueck08(BigDecimal rueck08) {
         this.rueck08 = rueck08;
     }
@@ -313,7 +313,7 @@
     public BigDecimal getMasche09() {
         return this.masche09;
     }
-    
+
     public void setMasche09(BigDecimal masche09) {
         this.masche09 = masche09;
     }
@@ -323,7 +323,7 @@
     public BigDecimal getRueck09() {
         return this.rueck09;
     }
-    
+
     public void setRueck09(BigDecimal rueck09) {
         this.rueck09 = rueck09;
     }
@@ -333,7 +333,7 @@
     public BigDecimal getMasche10() {
         return this.masche10;
     }
-    
+
     public void setMasche10(BigDecimal masche10) {
         this.masche10 = masche10;
     }
@@ -343,7 +343,7 @@
     public BigDecimal getRueck10() {
         return this.rueck10;
     }
-    
+
     public void setRueck10(BigDecimal rueck10) {
         this.rueck10 = rueck10;
     }
@@ -353,7 +353,7 @@
     public BigDecimal getMasche11() {
         return this.masche11;
     }
-    
+
     public void setMasche11(BigDecimal masche11) {
         this.masche11 = masche11;
     }
@@ -363,7 +363,7 @@
     public BigDecimal getRueck11() {
         return this.rueck11;
     }
-    
+
     public void setRueck11(BigDecimal rueck11) {
         this.rueck11 = rueck11;
     }
@@ -373,7 +373,7 @@
     public BigDecimal getMasche12() {
         return this.masche12;
     }
-    
+
     public void setMasche12(BigDecimal masche12) {
         this.masche12 = masche12;
     }
@@ -383,7 +383,7 @@
     public BigDecimal getRueck12() {
         return this.rueck12;
     }
-    
+
     public void setRueck12(BigDecimal rueck12) {
         this.rueck12 = rueck12;
     }
@@ -393,7 +393,7 @@
     public BigDecimal getMasche13() {
         return this.masche13;
     }
-    
+
     public void setMasche13(BigDecimal masche13) {
         this.masche13 = masche13;
     }
@@ -403,7 +403,7 @@
     public BigDecimal getRueck13() {
         return this.rueck13;
     }
-    
+
     public void setRueck13(BigDecimal rueck13) {
         this.rueck13 = rueck13;
     }
@@ -413,7 +413,7 @@
     public BigDecimal getMasche14() {
         return this.masche14;
     }
-    
+
     public void setMasche14(BigDecimal masche14) {
         this.masche14 = masche14;
     }
@@ -423,7 +423,7 @@
     public BigDecimal getRueck14() {
         return this.rueck14;
     }
-    
+
     public void setRueck14(BigDecimal rueck14) {
         this.rueck14 = rueck14;
     }
@@ -433,7 +433,7 @@
     public BigDecimal getMasche15() {
         return this.masche15;
     }
-    
+
     public void setMasche15(BigDecimal masche15) {
         this.masche15 = masche15;
     }
@@ -443,7 +443,7 @@
     public BigDecimal getRueck15() {
         return this.rueck15;
     }
-    
+
     public void setRueck15(BigDecimal rueck15) {
         this.rueck15 = rueck15;
     }
@@ -453,7 +453,7 @@
     public BigDecimal getMasche16() {
         return this.masche16;
     }
-    
+
     public void setMasche16(BigDecimal masche16) {
         this.masche16 = masche16;
     }
@@ -463,7 +463,7 @@
     public BigDecimal getRueck16() {
         return this.rueck16;
     }
-    
+
     public void setRueck16(BigDecimal rueck16) {
         this.rueck16 = rueck16;
     }
@@ -473,7 +473,7 @@
     public BigDecimal getMasche17() {
         return this.masche17;
     }
-    
+
     public void setMasche17(BigDecimal masche17) {
         this.masche17 = masche17;
     }
@@ -483,7 +483,7 @@
     public BigDecimal getRueck17() {
         return this.rueck17;
     }
-    
+
     public void setRueck17(BigDecimal rueck17) {
         this.rueck17 = rueck17;
     }
@@ -493,7 +493,7 @@
     public BigDecimal getMasche18() {
         return this.masche18;
     }
-    
+
     public void setMasche18(BigDecimal masche18) {
         this.masche18 = masche18;
     }
@@ -503,7 +503,7 @@
     public BigDecimal getRueck18() {
         return this.rueck18;
     }
-    
+
     public void setRueck18(BigDecimal rueck18) {
         this.rueck18 = rueck18;
     }
@@ -513,7 +513,7 @@
     public BigDecimal getMasche19() {
         return this.masche19;
     }
-    
+
     public void setMasche19(BigDecimal masche19) {
         this.masche19 = masche19;
     }
@@ -523,7 +523,7 @@
     public BigDecimal getRueck19() {
         return this.rueck19;
     }
-    
+
     public void setRueck19(BigDecimal rueck19) {
         this.rueck19 = rueck19;
     }
@@ -533,7 +533,7 @@
     public BigDecimal getMasche20() {
         return this.masche20;
     }
-    
+
     public void setMasche20(BigDecimal masche20) {
         this.masche20 = masche20;
     }
@@ -543,7 +543,7 @@
     public BigDecimal getRueck20() {
         return this.rueck20;
     }
-    
+
     public void setRueck20(BigDecimal rueck20) {
         this.rueck20 = rueck20;
     }
@@ -553,7 +553,7 @@
     public BigDecimal getMasche21() {
         return this.masche21;
     }
-    
+
     public void setMasche21(BigDecimal masche21) {
         this.masche21 = masche21;
     }
@@ -563,7 +563,7 @@
     public BigDecimal getRueck21() {
         return this.rueck21;
     }
-    
+
     public void setRueck21(BigDecimal rueck21) {
         this.rueck21 = rueck21;
     }
@@ -573,7 +573,7 @@
     public BigDecimal getRest() {
         return this.rest;
     }
-    
+
     public void setRest(BigDecimal rest) {
         this.rest = rest;
     }
@@ -583,8 +583,8 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof GsiebungsiebId) ) return false;
-         GsiebungsiebId castOther = ( GsiebungsiebId ) other; 
-         
+         GsiebungsiebId castOther = ( GsiebungsiebId ) other;
+
          return (this.getGlotrechteid()==castOther.getGlotrechteid())
  && (this.getGsiebsatzid()==castOther.getGsiebsatzid())
  && ( (this.getGmasse()==castOther.getGmasse()) || ( this.getGmasse()!=null && castOther.getGmasse()!=null && this.getGmasse().equals(castOther.getGmasse()) ) )
@@ -632,10 +632,10 @@
  && ( (this.getRueck21()==castOther.getRueck21()) || ( this.getRueck21()!=null && castOther.getRueck21()!=null && this.getRueck21().equals(castOther.getRueck21()) ) )
  && ( (this.getRest()==castOther.getRest()) || ( this.getRest()!=null && castOther.getRest()!=null && this.getRest().equals(castOther.getRest()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getGlotrechteid();
          result = 37 * result + (int) this.getGsiebsatzid();
          result = 37 * result + ( getGmasse() == null ? 0 : this.getGmasse().hashCode() );
@@ -683,5 +683,5 @@
          result = 37 * result + ( getRueck21() == null ? 0 : this.getRueck21().hashCode() );
          result = 37 * result + ( getRest() == null ? 0 : this.getRest().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilpunkt.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilpunkt.java	Fri Jun 15 09:20:49 2012 +0000
@@ -37,17 +37,17 @@
        this.y = y;
        this.z = z;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="hpeilungid", column=@Column(name="HPEILUNGID", nullable=false, precision=11, scale=0) ), 
+        @AttributeOverride(name="hpeilungid", column=@Column(name="HPEILUNGID", nullable=false, precision=11, scale=0) ),
         @AttributeOverride(name="punktnr", column=@Column(name="PUNKTNR", nullable=false, precision=5, scale=0) ) } )
     public HpeilpunktId getId() {
         return this.id;
     }
-    
+
     public void setId(HpeilpunktId id) {
         this.id = id;
     }
@@ -57,27 +57,27 @@
     public Hpeilung getHpeilung() {
         return this.hpeilung;
     }
-    
+
     public void setHpeilung(Hpeilung hpeilung) {
         this.hpeilung = hpeilung;
     }
 
-    
+
     @Column(name="Y", nullable=false, precision=8, scale=3)
     public BigDecimal getY() {
         return this.y;
     }
-    
+
     public void setY(BigDecimal y) {
         this.y = y;
     }
 
-    
+
     @Column(name="Z", nullable=false, precision=8, scale=3)
     public BigDecimal getZ() {
         return this.z;
     }
-    
+
     public void setZ(BigDecimal z) {
         this.z = z;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/HpeilpunktId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/HpeilpunktId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -22,14 +22,14 @@
        this.hpeilungid = hpeilungid;
        this.punktnr = punktnr;
     }
-   
+
 
 
     @Column(name="HPEILUNGID", nullable=false, precision=11, scale=0)
     public long getHpeilungid() {
         return this.hpeilungid;
     }
-    
+
     public void setHpeilungid(long hpeilungid) {
         this.hpeilungid = hpeilungid;
     }
@@ -39,7 +39,7 @@
     public int getPunktnr() {
         return this.punktnr;
     }
-    
+
     public void setPunktnr(int punktnr) {
         this.punktnr = punktnr;
     }
@@ -49,17 +49,17 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof HpeilpunktId) ) return false;
-         HpeilpunktId castOther = ( HpeilpunktId ) other; 
-         
+         HpeilpunktId castOther = ( HpeilpunktId ) other;
+
          return (this.getHpeilungid()==castOther.getHpeilungid())
  && (this.getPunktnr()==castOther.getPunktnr());
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getHpeilungid();
          result = 37 * result + this.getPunktnr();
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilung.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Hpeilung.java	Fri Jun 15 09:20:49 2012 +0000
@@ -110,15 +110,15 @@
        this.hpeilpunkts = hpeilpunkts;
        this.messungs = messungs;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="HPEILUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getHpeilungid() {
         return this.hpeilungid;
     }
-    
+
     public void setHpeilungid(long hpeilungid) {
         this.hpeilungid = hpeilungid;
     }
@@ -128,17 +128,17 @@
     public Station getStation() {
         return this.station;
     }
-    
+
     public void setStation(Station station) {
         this.station = station;
     }
 
-    
+
     @Column(name="KM", nullable=false, precision=8, scale=3)
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
@@ -148,267 +148,267 @@
     public Date getDatum() {
         return this.datum;
     }
-    
+
     public void setDatum(Date datum) {
         this.datum = datum;
     }
 
-    
+
     @Column(name="GLWNAME", length=8)
     public String getGlwname() {
         return this.glwname;
     }
-    
+
     public void setGlwname(String glwname) {
         this.glwname = glwname;
     }
 
-    
+
     @Column(name="GLWHOEHE", precision=8, scale=3)
     public BigDecimal getGlwhoehe() {
         return this.glwhoehe;
     }
-    
+
     public void setGlwhoehe(BigDecimal glwhoehe) {
         this.glwhoehe = glwhoehe;
     }
 
-    
+
     @Column(name="BULIABST", precision=8, scale=3)
     public BigDecimal getBuliabst() {
         return this.buliabst;
     }
-    
+
     public void setBuliabst(BigDecimal buliabst) {
         this.buliabst = buliabst;
     }
 
-    
+
     @Column(name="BULIHOEHE", precision=8, scale=3)
     public BigDecimal getBulihoehe() {
         return this.bulihoehe;
     }
-    
+
     public void setBulihoehe(BigDecimal bulihoehe) {
         this.bulihoehe = bulihoehe;
     }
 
-    
+
     @Column(name="BULIFUSS", precision=8, scale=3)
     public BigDecimal getBulifuss() {
         return this.bulifuss;
     }
-    
+
     public void setBulifuss(BigDecimal bulifuss) {
         this.bulifuss = bulifuss;
     }
 
-    
+
     @Column(name="BULIRUECKEN", precision=8, scale=3)
     public BigDecimal getBuliruecken() {
         return this.buliruecken;
     }
-    
+
     public void setBuliruecken(BigDecimal buliruecken) {
         this.buliruecken = buliruecken;
     }
 
-    
+
     @Column(name="BUREABST", precision=8, scale=3)
     public BigDecimal getBureabst() {
         return this.bureabst;
     }
-    
+
     public void setBureabst(BigDecimal bureabst) {
         this.bureabst = bureabst;
     }
 
-    
+
     @Column(name="BUREHOEHE", precision=8, scale=3)
     public BigDecimal getBurehoehe() {
         return this.burehoehe;
     }
-    
+
     public void setBurehoehe(BigDecimal burehoehe) {
         this.burehoehe = burehoehe;
     }
 
-    
+
     @Column(name="BUREFUSS", precision=8, scale=3)
     public BigDecimal getBurefuss() {
         return this.burefuss;
     }
-    
+
     public void setBurefuss(BigDecimal burefuss) {
         this.burefuss = burefuss;
     }
 
-    
+
     @Column(name="BURERUECKEN", precision=8, scale=3)
     public BigDecimal getBureruecken() {
         return this.bureruecken;
     }
-    
+
     public void setBureruecken(BigDecimal bureruecken) {
         this.bureruecken = bureruecken;
     }
 
-    
+
     @Column(name="FAHRLIABST", precision=8, scale=3)
     public BigDecimal getFahrliabst() {
         return this.fahrliabst;
     }
-    
+
     public void setFahrliabst(BigDecimal fahrliabst) {
         this.fahrliabst = fahrliabst;
     }
 
-    
+
     @Column(name="FAHRREABST", precision=8, scale=3)
     public BigDecimal getFahrreabst() {
         return this.fahrreabst;
     }
-    
+
     public void setFahrreabst(BigDecimal fahrreabst) {
         this.fahrreabst = fahrreabst;
     }
 
-    
+
     @Column(name="FAHRTIEF", precision=8, scale=3)
     public BigDecimal getFahrtief() {
         return this.fahrtief;
     }
-    
+
     public void setFahrtief(BigDecimal fahrtief) {
         this.fahrtief = fahrtief;
     }
 
-    
+
     @Column(name="AUSBLIABST", precision=8, scale=3)
     public BigDecimal getAusbliabst() {
         return this.ausbliabst;
     }
-    
+
     public void setAusbliabst(BigDecimal ausbliabst) {
         this.ausbliabst = ausbliabst;
     }
 
-    
+
     @Column(name="AUSBREABST", precision=8, scale=3)
     public BigDecimal getAusbreabst() {
         return this.ausbreabst;
     }
-    
+
     public void setAusbreabst(BigDecimal ausbreabst) {
         this.ausbreabst = ausbreabst;
     }
 
-    
+
     @Column(name="ACHSEABST", precision=8, scale=3)
     public BigDecimal getAchseabst() {
         return this.achseabst;
     }
-    
+
     public void setAchseabst(BigDecimal achseabst) {
         this.achseabst = achseabst;
     }
 
-    
+
     @Column(name="TEILVONABST", precision=8, scale=3)
     public BigDecimal getTeilvonabst() {
         return this.teilvonabst;
     }
-    
+
     public void setTeilvonabst(BigDecimal teilvonabst) {
         this.teilvonabst = teilvonabst;
     }
 
-    
+
     @Column(name="TEILBISABST", precision=8, scale=3)
     public BigDecimal getTeilbisabst() {
         return this.teilbisabst;
     }
-    
+
     public void setTeilbisabst(BigDecimal teilbisabst) {
         this.teilbisabst = teilbisabst;
     }
 
-    
+
     @Column(name="HMABST", precision=8, scale=3)
     public BigDecimal getHmabst() {
         return this.hmabst;
     }
-    
+
     public void setHmabst(BigDecimal hmabst) {
         this.hmabst = hmabst;
     }
 
-    
+
     @Column(name="LGKRECHTS", precision=11, scale=3)
     public BigDecimal getLgkrechts() {
         return this.lgkrechts;
     }
-    
+
     public void setLgkrechts(BigDecimal lgkrechts) {
         this.lgkrechts = lgkrechts;
     }
 
-    
+
     @Column(name="LGKHOCH", precision=11, scale=3)
     public BigDecimal getLgkhoch() {
         return this.lgkhoch;
     }
-    
+
     public void setLgkhoch(BigDecimal lgkhoch) {
         this.lgkhoch = lgkhoch;
     }
 
-    
+
     @Column(name="LGKHOEHE", precision=8, scale=3)
     public BigDecimal getLgkhoehe() {
         return this.lgkhoehe;
     }
-    
+
     public void setLgkhoehe(BigDecimal lgkhoehe) {
         this.lgkhoehe = lgkhoehe;
     }
 
-    
+
     @Column(name="RGKRECHTS", precision=11, scale=3)
     public BigDecimal getRgkrechts() {
         return this.rgkrechts;
     }
-    
+
     public void setRgkrechts(BigDecimal rgkrechts) {
         this.rgkrechts = rgkrechts;
     }
 
-    
+
     @Column(name="RGKHOCH", precision=11, scale=3)
     public BigDecimal getRgkhoch() {
         return this.rgkhoch;
     }
-    
+
     public void setRgkhoch(BigDecimal rgkhoch) {
         this.rgkhoch = rgkhoch;
     }
 
-    
+
     @Column(name="RGKHOEHE", precision=8, scale=3)
     public BigDecimal getRgkhoehe() {
         return this.rgkhoehe;
     }
-    
+
     public void setRgkhoehe(BigDecimal rgkhoehe) {
         this.rgkhoehe = rgkhoehe;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -418,27 +418,27 @@
     public Date getLastupdated() {
         return this.lastupdated;
     }
-    
+
     public void setLastupdated(Date lastupdated) {
         this.lastupdated = lastupdated;
     }
 
-    
+
     @Column(name="OLDPRFID", precision=11, scale=0)
     public Long getOldprfid() {
         return this.oldprfid;
     }
-    
+
     public void setOldprfid(Long oldprfid) {
         this.oldprfid = oldprfid;
     }
 
-    
+
     @Column(name="MITTEABST", precision=8, scale=3)
     public BigDecimal getMitteabst() {
         return this.mitteabst;
     }
-    
+
     public void setMitteabst(BigDecimal mitteabst) {
         this.mitteabst = mitteabst;
     }
@@ -447,7 +447,7 @@
     public Set<Hpeilpunkt> getHpeilpunkts() {
         return this.hpeilpunkts;
     }
-    
+
     public void setHpeilpunkts(Set<Hpeilpunkt> hpeilpunkts) {
         this.hpeilpunkts = hpeilpunkts;
     }
@@ -456,7 +456,7 @@
     public Set<Messung> getMessungs() {
         return this.messungs;
     }
-    
+
     public void setMessungs(Set<Messung> messungs) {
         this.messungs = messungs;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Messung.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messung.java	Fri Jun 15 09:20:49 2012 +0000
@@ -109,7 +109,7 @@
     public Messung() {
     }
 
-	
+
     public Messung(long messungid, Station station, Date datum, int messnr, int NGeschieb, int NVielpkt, Date lastupdated, BigDecimal glotabstoffset, BigDecimal slotabstoffset) {
         this.messungid = messungid;
         this.station = station;
@@ -202,15 +202,15 @@
        this.glotrechtes = glotrechtes;
        this.slotrechtes = slotrechtes;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="MESSUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
@@ -220,7 +220,7 @@
     public Station getStation() {
         return this.station;
     }
-    
+
     public void setStation(Station station) {
         this.station = station;
     }
@@ -230,7 +230,7 @@
     public Gsiebsatz getGsiebsatz() {
         return this.gsiebsatz;
     }
-    
+
     public void setGsiebsatz(Gsiebsatz gsiebsatz) {
         this.gsiebsatz = gsiebsatz;
     }
@@ -240,7 +240,7 @@
     public Gfaenger getGfaenger() {
         return this.gfaenger;
     }
-    
+
     public void setGfaenger(Gfaenger gfaenger) {
         this.gfaenger = gfaenger;
     }
@@ -250,7 +250,7 @@
     public Hpeilung getHpeilung() {
         return this.hpeilung;
     }
-    
+
     public void setHpeilung(Hpeilung hpeilung) {
         this.hpeilung = hpeilung;
     }
@@ -260,37 +260,37 @@
     public Date getDatum() {
         return this.datum;
     }
-    
+
     public void setDatum(Date datum) {
         this.datum = datum;
     }
 
-    
+
     @Column(name="MPEILUNGID", precision=11, scale=0)
     public Long getMpeilungid() {
         return this.mpeilungid;
     }
-    
+
     public void setMpeilungid(Long mpeilungid) {
         this.mpeilungid = mpeilungid;
     }
 
-    
+
     @Column(name="MESSNR", nullable=false, precision=5, scale=0)
     public int getMessnr() {
         return this.messnr;
     }
-    
+
     public void setMessnr(int messnr) {
         this.messnr = messnr;
     }
 
-    
+
     @Column(name="FGUE", length=10)
     public String getFgue() {
         return this.fgue;
     }
-    
+
     public void setFgue(String fgue) {
         this.fgue = fgue;
     }
@@ -300,7 +300,7 @@
     public Date getUhrvon() {
         return this.uhrvon;
     }
-    
+
     public void setUhrvon(Date uhrvon) {
         this.uhrvon = uhrvon;
     }
@@ -310,567 +310,567 @@
     public Date getUhrbis() {
         return this.uhrbis;
     }
-    
+
     public void setUhrbis(Date uhrbis) {
         this.uhrbis = uhrbis;
     }
 
-    
+
     @Column(name="WSPCM", precision=8, scale=1)
     public BigDecimal getWspcm() {
         return this.wspcm;
     }
-    
+
     public void setWspcm(BigDecimal wspcm) {
         this.wspcm = wspcm;
     }
 
-    
+
     @Column(name="Q_BPEGEL", precision=8, scale=3)
     public BigDecimal getQBpegel() {
         return this.QBpegel;
     }
-    
+
     public void setQBpegel(BigDecimal QBpegel) {
         this.QBpegel = QBpegel;
     }
 
-    
+
     @Column(name="WSPNN", precision=8, scale=3)
     public BigDecimal getWspnn() {
         return this.wspnn;
     }
-    
+
     public void setWspnn(BigDecimal wspnn) {
         this.wspnn = wspnn;
     }
 
-    
+
     @Column(name="IE", precision=6, scale=3)
     public BigDecimal getIe() {
         return this.ie;
     }
-    
+
     public void setIe(BigDecimal ie) {
         this.ie = ie;
     }
 
-    
+
     @Column(name="WTEMP", precision=4, scale=1)
     public BigDecimal getWtemp() {
         return this.wtemp;
     }
-    
+
     public void setWtemp(BigDecimal wtemp) {
         this.wtemp = wtemp;
     }
 
-    
+
     @Column(name="GBREITE", precision=8, scale=3)
     public BigDecimal getGbreite() {
         return this.gbreite;
     }
-    
+
     public void setGbreite(BigDecimal gbreite) {
         this.gbreite = gbreite;
     }
 
-    
+
     @Column(name="GBREITEVON", precision=8, scale=3)
     public BigDecimal getGbreitevon() {
         return this.gbreitevon;
     }
-    
+
     public void setGbreitevon(BigDecimal gbreitevon) {
         this.gbreitevon = gbreitevon;
     }
 
-    
+
     @Column(name="GBREITEBIS", precision=8, scale=3)
     public BigDecimal getGbreitebis() {
         return this.gbreitebis;
     }
-    
+
     public void setGbreitebis(BigDecimal gbreitebis) {
         this.gbreitebis = gbreitebis;
     }
 
-    
+
     @Column(name="TGESCHIEBE", precision=9, scale=3)
     public BigDecimal getTgeschiebe() {
         return this.tgeschiebe;
     }
-    
+
     public void setTgeschiebe(BigDecimal tgeschiebe) {
         this.tgeschiebe = tgeschiebe;
     }
 
-    
+
     @Column(name="TSAND", precision=9, scale=3)
     public BigDecimal getTsand() {
         return this.tsand;
     }
-    
+
     public void setTsand(BigDecimal tsand) {
         this.tsand = tsand;
     }
 
-    
+
     @Column(name="TSCHWEB", precision=9, scale=3)
     public BigDecimal getTschweb() {
         return this.tschweb;
     }
-    
+
     public void setTschweb(BigDecimal tschweb) {
         this.tschweb = tschweb;
     }
 
-    
+
     @Column(name="CSCHWEB", precision=8, scale=3)
     public BigDecimal getCschweb() {
         return this.cschweb;
     }
-    
+
     public void setCschweb(BigDecimal cschweb) {
         this.cschweb = cschweb;
     }
 
-    
+
     @Column(name="UFERLIABST", precision=8, scale=3)
     public BigDecimal getUferliabst() {
         return this.uferliabst;
     }
-    
+
     public void setUferliabst(BigDecimal uferliabst) {
         this.uferliabst = uferliabst;
     }
 
-    
+
     @Column(name="UFERREABST", precision=8, scale=3)
     public BigDecimal getUferreabst() {
         return this.uferreabst;
     }
-    
+
     public void setUferreabst(BigDecimal uferreabst) {
         this.uferreabst = uferreabst;
     }
 
-    
+
     @Column(name="Q", precision=8, scale=3)
     public BigDecimal getQ() {
         return this.q;
     }
-    
+
     public void setQ(BigDecimal q) {
         this.q = q;
     }
 
-    
+
     @Column(name="A_HPEIL", precision=6, scale=1)
     public BigDecimal getAHpeil() {
         return this.AHpeil;
     }
-    
+
     public void setAHpeil(BigDecimal AHpeil) {
         this.AHpeil = AHpeil;
     }
 
-    
+
     @Column(name="A_MPEIL", precision=6, scale=1)
     public BigDecimal getAMpeil() {
         return this.AMpeil;
     }
-    
+
     public void setAMpeil(BigDecimal AMpeil) {
         this.AMpeil = AMpeil;
     }
 
-    
+
     @Column(name="B", precision=8, scale=3)
     public BigDecimal getB() {
         return this.b;
     }
-    
+
     public void setB(BigDecimal b) {
         this.b = b;
     }
 
-    
+
     @Column(name="HM", precision=8, scale=3)
     public BigDecimal getHm() {
         return this.hm;
     }
-    
+
     public void setHm(BigDecimal hm) {
         this.hm = hm;
     }
 
-    
+
     @Column(name="VM", precision=6, scale=4)
     public BigDecimal getVm() {
         return this.vm;
     }
-    
+
     public void setVm(BigDecimal vm) {
         this.vm = vm;
     }
 
-    
+
     @Column(name="VSOHLE", precision=6, scale=4)
     public BigDecimal getVsohle() {
         return this.vsohle;
     }
-    
+
     public void setVsohle(BigDecimal vsohle) {
         this.vsohle = vsohle;
     }
 
-    
+
     @Column(name="TAU", precision=9, scale=4)
     public BigDecimal getTau() {
         return this.tau;
     }
-    
+
     public void setTau(BigDecimal tau) {
         this.tau = tau;
     }
 
-    
+
     @Column(name="TAUV", precision=9, scale=6)
     public BigDecimal getTauv() {
         return this.tauv;
     }
-    
+
     public void setTauv(BigDecimal tauv) {
         this.tauv = tauv;
     }
 
-    
+
     @Column(name="TEIL_Q", precision=8, scale=3)
     public BigDecimal getTeilQ() {
         return this.teilQ;
     }
-    
+
     public void setTeilQ(BigDecimal teilQ) {
         this.teilQ = teilQ;
     }
 
-    
+
     @Column(name="TEIL_A_HPEIL", precision=6, scale=1)
     public BigDecimal getTeilAHpeil() {
         return this.teilAHpeil;
     }
-    
+
     public void setTeilAHpeil(BigDecimal teilAHpeil) {
         this.teilAHpeil = teilAHpeil;
     }
 
-    
+
     @Column(name="TEIL_A_MPEIL", precision=6, scale=1)
     public BigDecimal getTeilAMpeil() {
         return this.teilAMpeil;
     }
-    
+
     public void setTeilAMpeil(BigDecimal teilAMpeil) {
         this.teilAMpeil = teilAMpeil;
     }
 
-    
+
     @Column(name="TEIL_B", precision=8, scale=3)
     public BigDecimal getTeilB() {
         return this.teilB;
     }
-    
+
     public void setTeilB(BigDecimal teilB) {
         this.teilB = teilB;
     }
 
-    
+
     @Column(name="TEIL_HM", precision=8, scale=3)
     public BigDecimal getTeilHm() {
         return this.teilHm;
     }
-    
+
     public void setTeilHm(BigDecimal teilHm) {
         this.teilHm = teilHm;
     }
 
-    
+
     @Column(name="TEIL_VM", precision=6, scale=4)
     public BigDecimal getTeilVm() {
         return this.teilVm;
     }
-    
+
     public void setTeilVm(BigDecimal teilVm) {
         this.teilVm = teilVm;
     }
 
-    
+
     @Column(name="TEIL_VSOHLE", precision=6, scale=4)
     public BigDecimal getTeilVsohle() {
         return this.teilVsohle;
     }
-    
+
     public void setTeilVsohle(BigDecimal teilVsohle) {
         this.teilVsohle = teilVsohle;
     }
 
-    
+
     @Column(name="TEIL_TAU", precision=9, scale=4)
     public BigDecimal getTeilTau() {
         return this.teilTau;
     }
-    
+
     public void setTeilTau(BigDecimal teilTau) {
         this.teilTau = teilTau;
     }
 
-    
+
     @Column(name="TEIL_TAUV", precision=9, scale=6)
     public BigDecimal getTeilTauv() {
         return this.teilTauv;
     }
-    
+
     public void setTeilTauv(BigDecimal teilTauv) {
         this.teilTauv = teilTauv;
     }
 
-    
+
     @Column(name="MITTELTYP", precision=1, scale=0)
     public Boolean getMitteltyp() {
         return this.mitteltyp;
     }
-    
+
     public void setMitteltyp(Boolean mitteltyp) {
         this.mitteltyp = mitteltyp;
     }
 
-    
+
     @Column(name="DM", precision=7, scale=3)
     public BigDecimal getDm() {
         return this.dm;
     }
-    
+
     public void setDm(BigDecimal dm) {
         this.dm = dm;
     }
 
-    
+
     @Column(name="SK", precision=8, scale=3)
     public BigDecimal getSk() {
         return this.sk;
     }
-    
+
     public void setSk(BigDecimal sk) {
         this.sk = sk;
     }
 
-    
+
     @Column(name="SO", precision=8, scale=3)
     public BigDecimal getSo() {
         return this.so;
     }
-    
+
     public void setSo(BigDecimal so) {
         this.so = so;
     }
 
-    
+
     @Column(name="U", precision=8, scale=3)
     public BigDecimal getU() {
         return this.u;
     }
-    
+
     public void setU(BigDecimal u) {
         this.u = u;
     }
 
-    
+
     @Column(name="D90", precision=7, scale=4)
     public BigDecimal getD90() {
         return this.d90;
     }
-    
+
     public void setD90(BigDecimal d90) {
         this.d90 = d90;
     }
 
-    
+
     @Column(name="D84", precision=7, scale=4)
     public BigDecimal getD84() {
         return this.d84;
     }
-    
+
     public void setD84(BigDecimal d84) {
         this.d84 = d84;
     }
 
-    
+
     @Column(name="D80", precision=7, scale=4)
     public BigDecimal getD80() {
         return this.d80;
     }
-    
+
     public void setD80(BigDecimal d80) {
         this.d80 = d80;
     }
 
-    
+
     @Column(name="D75", precision=7, scale=4)
     public BigDecimal getD75() {
         return this.d75;
     }
-    
+
     public void setD75(BigDecimal d75) {
         this.d75 = d75;
     }
 
-    
+
     @Column(name="D70", precision=7, scale=4)
     public BigDecimal getD70() {
         return this.d70;
     }
-    
+
     public void setD70(BigDecimal d70) {
         this.d70 = d70;
     }
 
-    
+
     @Column(name="D60", precision=7, scale=4)
     public BigDecimal getD60() {
         return this.d60;
     }
-    
+
     public void setD60(BigDecimal d60) {
         this.d60 = d60;
     }
 
-    
+
     @Column(name="D50", precision=7, scale=4)
     public BigDecimal getD50() {
         return this.d50;
     }
-    
+
     public void setD50(BigDecimal d50) {
         this.d50 = d50;
     }
 
-    
+
     @Column(name="D40", precision=7, scale=4)
     public BigDecimal getD40() {
         return this.d40;
     }
-    
+
     public void setD40(BigDecimal d40) {
         this.d40 = d40;
     }
 
-    
+
     @Column(name="D30", precision=7, scale=4)
     public BigDecimal getD30() {
         return this.d30;
     }
-    
+
     public void setD30(BigDecimal d30) {
         this.d30 = d30;
     }
 
-    
+
     @Column(name="D25", precision=7, scale=4)
     public BigDecimal getD25() {
         return this.d25;
     }
-    
+
     public void setD25(BigDecimal d25) {
         this.d25 = d25;
     }
 
-    
+
     @Column(name="D20", precision=7, scale=4)
     public BigDecimal getD20() {
         return this.d20;
     }
-    
+
     public void setD20(BigDecimal d20) {
         this.d20 = d20;
     }
 
-    
+
     @Column(name="D16", precision=7, scale=4)
     public BigDecimal getD16() {
         return this.d16;
     }
-    
+
     public void setD16(BigDecimal d16) {
         this.d16 = d16;
     }
 
-    
+
     @Column(name="D10", precision=7, scale=4)
     public BigDecimal getD10() {
         return this.d10;
     }
-    
+
     public void setD10(BigDecimal d10) {
         this.d10 = d10;
     }
 
-    
+
     @Column(name="DMIN", precision=7, scale=4)
     public BigDecimal getDmin() {
         return this.dmin;
     }
-    
+
     public void setDmin(BigDecimal dmin) {
         this.dmin = dmin;
     }
 
-    
+
     @Column(name="DURCHDMIN", precision=6, scale=3)
     public BigDecimal getDurchdmin() {
         return this.durchdmin;
     }
-    
+
     public void setDurchdmin(BigDecimal durchdmin) {
         this.durchdmin = durchdmin;
     }
 
-    
+
     @Column(name="DMAX", precision=7, scale=3)
     public BigDecimal getDmax() {
         return this.dmax;
     }
-    
+
     public void setDmax(BigDecimal dmax) {
         this.dmax = dmax;
     }
 
-    
+
     @Column(name="DURCHDMAX", precision=6, scale=3)
     public BigDecimal getDurchdmax() {
         return this.durchdmax;
     }
-    
+
     public void setDurchdmax(BigDecimal durchdmax) {
         this.durchdmax = durchdmax;
     }
 
-    
+
     @Column(name="N_GESCHIEB", nullable=false, precision=5, scale=0)
     public int getNGeschieb() {
         return this.NGeschieb;
     }
-    
+
     public void setNGeschieb(int NGeschieb) {
         this.NGeschieb = NGeschieb;
     }
 
-    
+
     @Column(name="N_VIELPKT", nullable=false, precision=5, scale=0)
     public int getNVielpkt() {
         return this.NVielpkt;
     }
-    
+
     public void setNVielpkt(int NVielpkt) {
         this.NVielpkt = NVielpkt;
     }
@@ -880,17 +880,17 @@
     public Date getSysDate() {
         return this.sysDate;
     }
-    
+
     public void setSysDate(Date sysDate) {
         this.sysDate = sysDate;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -900,77 +900,77 @@
     public Date getLastupdated() {
         return this.lastupdated;
     }
-    
+
     public void setLastupdated(Date lastupdated) {
         this.lastupdated = lastupdated;
     }
 
-    
+
     @Column(name="KM", precision=8, scale=3)
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
 
-    
+
     @Column(name="GLOTABSTOFFSET", nullable=false, precision=8, scale=3)
     public BigDecimal getGlotabstoffset() {
         return this.glotabstoffset;
     }
-    
+
     public void setGlotabstoffset(BigDecimal glotabstoffset) {
         this.glotabstoffset = glotabstoffset;
     }
 
-    
+
     @Column(name="SLOTABSTOFFSET", nullable=false, precision=8, scale=3)
     public BigDecimal getSlotabstoffset() {
         return this.slotabstoffset;
     }
-    
+
     public void setSlotabstoffset(BigDecimal slotabstoffset) {
         this.slotabstoffset = slotabstoffset;
     }
 
-    
+
     @Column(name="GBREITEVONLINKS", precision=8, scale=3)
     public BigDecimal getGbreitevonlinks() {
         return this.gbreitevonlinks;
     }
-    
+
     public void setGbreitevonlinks(BigDecimal gbreitevonlinks) {
         this.gbreitevonlinks = gbreitevonlinks;
     }
 
-    
+
     @Column(name="GBREITEBISLINKS", precision=8, scale=3)
     public BigDecimal getGbreitebislinks() {
         return this.gbreitebislinks;
     }
-    
+
     public void setGbreitebislinks(BigDecimal gbreitebislinks) {
         this.gbreitebislinks = gbreitebislinks;
     }
 
-    
+
     @Column(name="GLOTUFERABSTISTVONLINKS", precision=1, scale=0)
     public Boolean getGlotuferabstistvonlinks() {
         return this.glotuferabstistvonlinks;
     }
-    
+
     public void setGlotuferabstistvonlinks(Boolean glotuferabstistvonlinks) {
         this.glotuferabstistvonlinks = glotuferabstistvonlinks;
     }
 
-    
+
     @Column(name="SLOTUFERABSTISTVONLINKS", precision=1, scale=0)
     public Boolean getSlotuferabstistvonlinks() {
         return this.slotuferabstistvonlinks;
     }
-    
+
     public void setSlotuferabstistvonlinks(Boolean slotuferabstistvonlinks) {
         this.slotuferabstistvonlinks = slotuferabstistvonlinks;
     }
@@ -979,7 +979,7 @@
     public Set<Glotrechte> getGlotrechtes() {
         return this.glotrechtes;
     }
-    
+
     public void setGlotrechtes(Set<Glotrechte> glotrechtes) {
         this.glotrechtes = glotrechtes;
     }
@@ -988,7 +988,7 @@
     public Set<Slotrechte> getSlotrechtes() {
         return this.slotrechtes;
     }
-    
+
     public void setSlotrechtes(Set<Slotrechte> slotrechtes) {
         this.slotrechtes = slotrechtes;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Messunglotcount.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messunglotcount.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,18 +27,18 @@
     public Messunglotcount(MessunglotcountId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="glotcount", column=@Column(name="GLOTCOUNT", precision=22, scale=0) ), 
+        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="glotcount", column=@Column(name="GLOTCOUNT", precision=22, scale=0) ),
         @AttributeOverride(name="slotcount", column=@Column(name="SLOTCOUNT", precision=22, scale=0) ) } )
     public MessunglotcountId getId() {
         return this.id;
     }
-    
+
     public void setId(MessunglotcountId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/MessunglotcountId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/MessunglotcountId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -20,7 +20,7 @@
     public MessunglotcountId() {
     }
 
-    
+
     public MessunglotcountId(long messungid) {
         this.messungid = messungid;
     }
@@ -29,14 +29,14 @@
        this.glotcount = glotcount;
        this.slotcount = slotcount;
     }
-   
+
 
 
     @Column(name="MESSUNGID", nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
@@ -46,7 +46,7 @@
     public BigDecimal getGlotcount() {
         return this.glotcount;
     }
-    
+
     public void setGlotcount(BigDecimal glotcount) {
         this.glotcount = glotcount;
     }
@@ -56,7 +56,7 @@
     public BigDecimal getSlotcount() {
         return this.slotcount;
     }
-    
+
     public void setSlotcount(BigDecimal slotcount) {
         this.slotcount = slotcount;
     }
@@ -66,19 +66,19 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof MessunglotcountId) ) return false;
-         MessunglotcountId castOther = ( MessunglotcountId ) other; 
-         
+         MessunglotcountId castOther = ( MessunglotcountId ) other;
+
          return (this.getMessungid()==castOther.getMessungid())
  && ( (this.getGlotcount()==castOther.getGlotcount()) || ( this.getGlotcount()!=null && castOther.getGlotcount()!=null && this.getGlotcount().equals(castOther.getGlotcount()) ) )
  && ( (this.getSlotcount()==castOther.getSlotcount()) || ( this.getSlotcount()!=null && castOther.getSlotcount()!=null && this.getSlotcount().equals(castOther.getSlotcount()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getMessungid();
          result = 37 * result + ( getGlotcount() == null ? 0 : this.getGlotcount().hashCode() );
          result = 37 * result + ( getSlotcount() == null ? 0 : this.getSlotcount().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Messungsta.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messungsta.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,95 +27,95 @@
     public Messungsta(MessungstaId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID") ), 
-        @AttributeOverride(name="stationid", column=@Column(name="STATIONID") ), 
-        @AttributeOverride(name="datum", column=@Column(name="DATUM") ), 
-        @AttributeOverride(name="hpeilungid", column=@Column(name="HPEILUNGID") ), 
-        @AttributeOverride(name="mpeilungid", column=@Column(name="MPEILUNGID") ), 
-        @AttributeOverride(name="gfaengerid", column=@Column(name="GFAENGERID") ), 
-        @AttributeOverride(name="gsiebsatzid", column=@Column(name="GSIEBSATZID") ), 
-        @AttributeOverride(name="messnr", column=@Column(name="MESSNR") ), 
-        @AttributeOverride(name="fgue", column=@Column(name="FGUE") ), 
-        @AttributeOverride(name="uhrvon", column=@Column(name="UHRVON") ), 
-        @AttributeOverride(name="uhrbis", column=@Column(name="UHRBIS") ), 
-        @AttributeOverride(name="wspcm", column=@Column(name="WSPCM") ), 
-        @AttributeOverride(name="QBpegel", column=@Column(name="Q_BPEGEL") ), 
-        @AttributeOverride(name="wspnn", column=@Column(name="WSPNN") ), 
-        @AttributeOverride(name="ie", column=@Column(name="IE") ), 
-        @AttributeOverride(name="wtemp", column=@Column(name="WTEMP") ), 
-        @AttributeOverride(name="gbreite", column=@Column(name="GBREITE") ), 
-        @AttributeOverride(name="gbreitevon", column=@Column(name="GBREITEVON") ), 
-        @AttributeOverride(name="gbreitebis", column=@Column(name="GBREITEBIS") ), 
-        @AttributeOverride(name="tgeschiebe", column=@Column(name="TGESCHIEBE") ), 
-        @AttributeOverride(name="tsand", column=@Column(name="TSAND") ), 
-        @AttributeOverride(name="tschweb", column=@Column(name="TSCHWEB") ), 
-        @AttributeOverride(name="cschweb", column=@Column(name="CSCHWEB") ), 
-        @AttributeOverride(name="uferliabst", column=@Column(name="UFERLIABST") ), 
-        @AttributeOverride(name="uferreabst", column=@Column(name="UFERREABST") ), 
-        @AttributeOverride(name="q", column=@Column(name="Q") ), 
-        @AttributeOverride(name="AHpeil", column=@Column(name="A_HPEIL") ), 
-        @AttributeOverride(name="AMpeil", column=@Column(name="A_MPEIL") ), 
-        @AttributeOverride(name="b", column=@Column(name="B") ), 
-        @AttributeOverride(name="hm", column=@Column(name="HM") ), 
-        @AttributeOverride(name="vm", column=@Column(name="VM") ), 
-        @AttributeOverride(name="vsohle", column=@Column(name="VSOHLE") ), 
-        @AttributeOverride(name="tau", column=@Column(name="TAU") ), 
-        @AttributeOverride(name="tauv", column=@Column(name="TAUV") ), 
-        @AttributeOverride(name="teilQ", column=@Column(name="TEIL_Q") ), 
-        @AttributeOverride(name="teilAHpeil", column=@Column(name="TEIL_A_HPEIL") ), 
-        @AttributeOverride(name="teilAMpeil", column=@Column(name="TEIL_A_MPEIL") ), 
-        @AttributeOverride(name="teilB", column=@Column(name="TEIL_B") ), 
-        @AttributeOverride(name="teilHm", column=@Column(name="TEIL_HM") ), 
-        @AttributeOverride(name="teilVm", column=@Column(name="TEIL_VM") ), 
-        @AttributeOverride(name="teilVsohle", column=@Column(name="TEIL_VSOHLE") ), 
-        @AttributeOverride(name="teilTau", column=@Column(name="TEIL_TAU") ), 
-        @AttributeOverride(name="teilTauv", column=@Column(name="TEIL_TAUV") ), 
-        @AttributeOverride(name="mitteltyp", column=@Column(name="MITTELTYP") ), 
-        @AttributeOverride(name="dm", column=@Column(name="DM") ), 
-        @AttributeOverride(name="sk", column=@Column(name="SK") ), 
-        @AttributeOverride(name="so", column=@Column(name="SO") ), 
-        @AttributeOverride(name="u", column=@Column(name="U") ), 
-        @AttributeOverride(name="d90", column=@Column(name="D90") ), 
-        @AttributeOverride(name="d84", column=@Column(name="D84") ), 
-        @AttributeOverride(name="d80", column=@Column(name="D80") ), 
-        @AttributeOverride(name="d75", column=@Column(name="D75") ), 
-        @AttributeOverride(name="d70", column=@Column(name="D70") ), 
-        @AttributeOverride(name="d60", column=@Column(name="D60") ), 
-        @AttributeOverride(name="d50", column=@Column(name="D50") ), 
-        @AttributeOverride(name="d40", column=@Column(name="D40") ), 
-        @AttributeOverride(name="d30", column=@Column(name="D30") ), 
-        @AttributeOverride(name="d25", column=@Column(name="D25") ), 
-        @AttributeOverride(name="d20", column=@Column(name="D20") ), 
-        @AttributeOverride(name="d16", column=@Column(name="D16") ), 
-        @AttributeOverride(name="d10", column=@Column(name="D10") ), 
-        @AttributeOverride(name="dmin", column=@Column(name="DMIN") ), 
-        @AttributeOverride(name="durchdmin", column=@Column(name="DURCHDMIN") ), 
-        @AttributeOverride(name="dmax", column=@Column(name="DMAX") ), 
-        @AttributeOverride(name="durchdmax", column=@Column(name="DURCHDMAX") ), 
-        @AttributeOverride(name="NGeschieb", column=@Column(name="N_GESCHIEB") ), 
-        @AttributeOverride(name="NVielpkt", column=@Column(name="N_VIELPKT") ), 
-        @AttributeOverride(name="sysDate", column=@Column(name="SYS_DATE") ), 
-        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG") ), 
-        @AttributeOverride(name="lastupdated", column=@Column(name="LASTUPDATED") ), 
-        @AttributeOverride(name="km", column=@Column(name="KM") ), 
-        @AttributeOverride(name="glotabstoffset", column=@Column(name="GLOTABSTOFFSET") ), 
-        @AttributeOverride(name="slotabstoffset", column=@Column(name="SLOTABSTOFFSET") ), 
-        @AttributeOverride(name="gbreitevonlinks", column=@Column(name="GBREITEVONLINKS") ), 
-        @AttributeOverride(name="gbreitebislinks", column=@Column(name="GBREITEBISLINKS") ), 
-        @AttributeOverride(name="staname", column=@Column(name="STANAME") ), 
-        @AttributeOverride(name="stakm", column=@Column(name="STAKM") ), 
-        @AttributeOverride(name="gewaesserid", column=@Column(name="GEWAESSERID") ), 
-        @AttributeOverride(name="gewname", column=@Column(name="GEWNAME") ), 
+        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID") ),
+        @AttributeOverride(name="stationid", column=@Column(name="STATIONID") ),
+        @AttributeOverride(name="datum", column=@Column(name="DATUM") ),
+        @AttributeOverride(name="hpeilungid", column=@Column(name="HPEILUNGID") ),
+        @AttributeOverride(name="mpeilungid", column=@Column(name="MPEILUNGID") ),
+        @AttributeOverride(name="gfaengerid", column=@Column(name="GFAENGERID") ),
+        @AttributeOverride(name="gsiebsatzid", column=@Column(name="GSIEBSATZID") ),
+        @AttributeOverride(name="messnr", column=@Column(name="MESSNR") ),
+        @AttributeOverride(name="fgue", column=@Column(name="FGUE") ),
+        @AttributeOverride(name="uhrvon", column=@Column(name="UHRVON") ),
+        @AttributeOverride(name="uhrbis", column=@Column(name="UHRBIS") ),
+        @AttributeOverride(name="wspcm", column=@Column(name="WSPCM") ),
+        @AttributeOverride(name="QBpegel", column=@Column(name="Q_BPEGEL") ),
+        @AttributeOverride(name="wspnn", column=@Column(name="WSPNN") ),
+        @AttributeOverride(name="ie", column=@Column(name="IE") ),
+        @AttributeOverride(name="wtemp", column=@Column(name="WTEMP") ),
+        @AttributeOverride(name="gbreite", column=@Column(name="GBREITE") ),
+        @AttributeOverride(name="gbreitevon", column=@Column(name="GBREITEVON") ),
+        @AttributeOverride(name="gbreitebis", column=@Column(name="GBREITEBIS") ),
+        @AttributeOverride(name="tgeschiebe", column=@Column(name="TGESCHIEBE") ),
+        @AttributeOverride(name="tsand", column=@Column(name="TSAND") ),
+        @AttributeOverride(name="tschweb", column=@Column(name="TSCHWEB") ),
+        @AttributeOverride(name="cschweb", column=@Column(name="CSCHWEB") ),
+        @AttributeOverride(name="uferliabst", column=@Column(name="UFERLIABST") ),
+        @AttributeOverride(name="uferreabst", column=@Column(name="UFERREABST") ),
+        @AttributeOverride(name="q", column=@Column(name="Q") ),
+        @AttributeOverride(name="AHpeil", column=@Column(name="A_HPEIL") ),
+        @AttributeOverride(name="AMpeil", column=@Column(name="A_MPEIL") ),
+        @AttributeOverride(name="b", column=@Column(name="B") ),
+        @AttributeOverride(name="hm", column=@Column(name="HM") ),
+        @AttributeOverride(name="vm", column=@Column(name="VM") ),
+        @AttributeOverride(name="vsohle", column=@Column(name="VSOHLE") ),
+        @AttributeOverride(name="tau", column=@Column(name="TAU") ),
+        @AttributeOverride(name="tauv", column=@Column(name="TAUV") ),
+        @AttributeOverride(name="teilQ", column=@Column(name="TEIL_Q") ),
+        @AttributeOverride(name="teilAHpeil", column=@Column(name="TEIL_A_HPEIL") ),
+        @AttributeOverride(name="teilAMpeil", column=@Column(name="TEIL_A_MPEIL") ),
+        @AttributeOverride(name="teilB", column=@Column(name="TEIL_B") ),
+        @AttributeOverride(name="teilHm", column=@Column(name="TEIL_HM") ),
+        @AttributeOverride(name="teilVm", column=@Column(name="TEIL_VM") ),
+        @AttributeOverride(name="teilVsohle", column=@Column(name="TEIL_VSOHLE") ),
+        @AttributeOverride(name="teilTau", column=@Column(name="TEIL_TAU") ),
+        @AttributeOverride(name="teilTauv", column=@Column(name="TEIL_TAUV") ),
+        @AttributeOverride(name="mitteltyp", column=@Column(name="MITTELTYP") ),
+        @AttributeOverride(name="dm", column=@Column(name="DM") ),
+        @AttributeOverride(name="sk", column=@Column(name="SK") ),
+        @AttributeOverride(name="so", column=@Column(name="SO") ),
+        @AttributeOverride(name="u", column=@Column(name="U") ),
+        @AttributeOverride(name="d90", column=@Column(name="D90") ),
+        @AttributeOverride(name="d84", column=@Column(name="D84") ),
+        @AttributeOverride(name="d80", column=@Column(name="D80") ),
+        @AttributeOverride(name="d75", column=@Column(name="D75") ),
+        @AttributeOverride(name="d70", column=@Column(name="D70") ),
+        @AttributeOverride(name="d60", column=@Column(name="D60") ),
+        @AttributeOverride(name="d50", column=@Column(name="D50") ),
+        @AttributeOverride(name="d40", column=@Column(name="D40") ),
+        @AttributeOverride(name="d30", column=@Column(name="D30") ),
+        @AttributeOverride(name="d25", column=@Column(name="D25") ),
+        @AttributeOverride(name="d20", column=@Column(name="D20") ),
+        @AttributeOverride(name="d16", column=@Column(name="D16") ),
+        @AttributeOverride(name="d10", column=@Column(name="D10") ),
+        @AttributeOverride(name="dmin", column=@Column(name="DMIN") ),
+        @AttributeOverride(name="durchdmin", column=@Column(name="DURCHDMIN") ),
+        @AttributeOverride(name="dmax", column=@Column(name="DMAX") ),
+        @AttributeOverride(name="durchdmax", column=@Column(name="DURCHDMAX") ),
+        @AttributeOverride(name="NGeschieb", column=@Column(name="N_GESCHIEB") ),
+        @AttributeOverride(name="NVielpkt", column=@Column(name="N_VIELPKT") ),
+        @AttributeOverride(name="sysDate", column=@Column(name="SYS_DATE") ),
+        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG") ),
+        @AttributeOverride(name="lastupdated", column=@Column(name="LASTUPDATED") ),
+        @AttributeOverride(name="km", column=@Column(name="KM") ),
+        @AttributeOverride(name="glotabstoffset", column=@Column(name="GLOTABSTOFFSET") ),
+        @AttributeOverride(name="slotabstoffset", column=@Column(name="SLOTABSTOFFSET") ),
+        @AttributeOverride(name="gbreitevonlinks", column=@Column(name="GBREITEVONLINKS") ),
+        @AttributeOverride(name="gbreitebislinks", column=@Column(name="GBREITEBISLINKS") ),
+        @AttributeOverride(name="staname", column=@Column(name="STANAME") ),
+        @AttributeOverride(name="stakm", column=@Column(name="STAKM") ),
+        @AttributeOverride(name="gewaesserid", column=@Column(name="GEWAESSERID") ),
+        @AttributeOverride(name="gewname", column=@Column(name="GEWNAME") ),
         @AttributeOverride(name="bezugspegelid", column=@Column(name="BEZUGSPEGELID") ) } )
     public MessungstaId getId() {
         return this.id;
     }
-    
+
     public void setId(MessungstaId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/MessungstaId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/MessungstaId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -179,14 +179,14 @@
        this.gewname = gewname;
        this.bezugspegelid = bezugspegelid;
     }
-   
+
 
 
     @Column(name="MESSUNGID")
     public Serializable getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(Serializable messungid) {
         this.messungid = messungid;
     }
@@ -196,7 +196,7 @@
     public Serializable getStationid() {
         return this.stationid;
     }
-    
+
     public void setStationid(Serializable stationid) {
         this.stationid = stationid;
     }
@@ -206,7 +206,7 @@
     public Serializable getDatum() {
         return this.datum;
     }
-    
+
     public void setDatum(Serializable datum) {
         this.datum = datum;
     }
@@ -216,7 +216,7 @@
     public Serializable getHpeilungid() {
         return this.hpeilungid;
     }
-    
+
     public void setHpeilungid(Serializable hpeilungid) {
         this.hpeilungid = hpeilungid;
     }
@@ -226,7 +226,7 @@
     public Serializable getMpeilungid() {
         return this.mpeilungid;
     }
-    
+
     public void setMpeilungid(Serializable mpeilungid) {
         this.mpeilungid = mpeilungid;
     }
@@ -236,7 +236,7 @@
     public Serializable getGfaengerid() {
         return this.gfaengerid;
     }
-    
+
     public void setGfaengerid(Serializable gfaengerid) {
         this.gfaengerid = gfaengerid;
     }
@@ -246,7 +246,7 @@
     public Serializable getGsiebsatzid() {
         return this.gsiebsatzid;
     }
-    
+
     public void setGsiebsatzid(Serializable gsiebsatzid) {
         this.gsiebsatzid = gsiebsatzid;
     }
@@ -256,7 +256,7 @@
     public Serializable getMessnr() {
         return this.messnr;
     }
-    
+
     public void setMessnr(Serializable messnr) {
         this.messnr = messnr;
     }
@@ -266,7 +266,7 @@
     public Serializable getFgue() {
         return this.fgue;
     }
-    
+
     public void setFgue(Serializable fgue) {
         this.fgue = fgue;
     }
@@ -276,7 +276,7 @@
     public Serializable getUhrvon() {
         return this.uhrvon;
     }
-    
+
     public void setUhrvon(Serializable uhrvon) {
         this.uhrvon = uhrvon;
     }
@@ -286,7 +286,7 @@
     public Serializable getUhrbis() {
         return this.uhrbis;
     }
-    
+
     public void setUhrbis(Serializable uhrbis) {
         this.uhrbis = uhrbis;
     }
@@ -296,7 +296,7 @@
     public Serializable getWspcm() {
         return this.wspcm;
     }
-    
+
     public void setWspcm(Serializable wspcm) {
         this.wspcm = wspcm;
     }
@@ -306,7 +306,7 @@
     public Serializable getQBpegel() {
         return this.QBpegel;
     }
-    
+
     public void setQBpegel(Serializable QBpegel) {
         this.QBpegel = QBpegel;
     }
@@ -316,7 +316,7 @@
     public Serializable getWspnn() {
         return this.wspnn;
     }
-    
+
     public void setWspnn(Serializable wspnn) {
         this.wspnn = wspnn;
     }
@@ -326,7 +326,7 @@
     public Serializable getIe() {
         return this.ie;
     }
-    
+
     public void setIe(Serializable ie) {
         this.ie = ie;
     }
@@ -336,7 +336,7 @@
     public Serializable getWtemp() {
         return this.wtemp;
     }
-    
+
     public void setWtemp(Serializable wtemp) {
         this.wtemp = wtemp;
     }
@@ -346,7 +346,7 @@
     public Serializable getGbreite() {
         return this.gbreite;
     }
-    
+
     public void setGbreite(Serializable gbreite) {
         this.gbreite = gbreite;
     }
@@ -356,7 +356,7 @@
     public Serializable getGbreitevon() {
         return this.gbreitevon;
     }
-    
+
     public void setGbreitevon(Serializable gbreitevon) {
         this.gbreitevon = gbreitevon;
     }
@@ -366,7 +366,7 @@
     public Serializable getGbreitebis() {
         return this.gbreitebis;
     }
-    
+
     public void setGbreitebis(Serializable gbreitebis) {
         this.gbreitebis = gbreitebis;
     }
@@ -376,7 +376,7 @@
     public Serializable getTgeschiebe() {
         return this.tgeschiebe;
     }
-    
+
     public void setTgeschiebe(Serializable tgeschiebe) {
         this.tgeschiebe = tgeschiebe;
     }
@@ -386,7 +386,7 @@
     public Serializable getTsand() {
         return this.tsand;
     }
-    
+
     public void setTsand(Serializable tsand) {
         this.tsand = tsand;
     }
@@ -396,7 +396,7 @@
     public Serializable getTschweb() {
         return this.tschweb;
     }
-    
+
     public void setTschweb(Serializable tschweb) {
         this.tschweb = tschweb;
     }
@@ -406,7 +406,7 @@
     public Serializable getCschweb() {
         return this.cschweb;
     }
-    
+
     public void setCschweb(Serializable cschweb) {
         this.cschweb = cschweb;
     }
@@ -416,7 +416,7 @@
     public Serializable getUferliabst() {
         return this.uferliabst;
     }
-    
+
     public void setUferliabst(Serializable uferliabst) {
         this.uferliabst = uferliabst;
     }
@@ -426,7 +426,7 @@
     public Serializable getUferreabst() {
         return this.uferreabst;
     }
-    
+
     public void setUferreabst(Serializable uferreabst) {
         this.uferreabst = uferreabst;
     }
@@ -436,7 +436,7 @@
     public Serializable getQ() {
         return this.q;
     }
-    
+
     public void setQ(Serializable q) {
         this.q = q;
     }
@@ -446,7 +446,7 @@
     public Serializable getAHpeil() {
         return this.AHpeil;
     }
-    
+
     public void setAHpeil(Serializable AHpeil) {
         this.AHpeil = AHpeil;
     }
@@ -456,7 +456,7 @@
     public Serializable getAMpeil() {
         return this.AMpeil;
     }
-    
+
     public void setAMpeil(Serializable AMpeil) {
         this.AMpeil = AMpeil;
     }
@@ -466,7 +466,7 @@
     public Serializable getB() {
         return this.b;
     }
-    
+
     public void setB(Serializable b) {
         this.b = b;
     }
@@ -476,7 +476,7 @@
     public Serializable getHm() {
         return this.hm;
     }
-    
+
     public void setHm(Serializable hm) {
         this.hm = hm;
     }
@@ -486,7 +486,7 @@
     public Serializable getVm() {
         return this.vm;
     }
-    
+
     public void setVm(Serializable vm) {
         this.vm = vm;
     }
@@ -496,7 +496,7 @@
     public Serializable getVsohle() {
         return this.vsohle;
     }
-    
+
     public void setVsohle(Serializable vsohle) {
         this.vsohle = vsohle;
     }
@@ -506,7 +506,7 @@
     public Serializable getTau() {
         return this.tau;
     }
-    
+
     public void setTau(Serializable tau) {
         this.tau = tau;
     }
@@ -516,7 +516,7 @@
     public Serializable getTauv() {
         return this.tauv;
     }
-    
+
     public void setTauv(Serializable tauv) {
         this.tauv = tauv;
     }
@@ -526,7 +526,7 @@
     public Serializable getTeilQ() {
         return this.teilQ;
     }
-    
+
     public void setTeilQ(Serializable teilQ) {
         this.teilQ = teilQ;
     }
@@ -536,7 +536,7 @@
     public Serializable getTeilAHpeil() {
         return this.teilAHpeil;
     }
-    
+
     public void setTeilAHpeil(Serializable teilAHpeil) {
         this.teilAHpeil = teilAHpeil;
     }
@@ -546,7 +546,7 @@
     public Serializable getTeilAMpeil() {
         return this.teilAMpeil;
     }
-    
+
     public void setTeilAMpeil(Serializable teilAMpeil) {
         this.teilAMpeil = teilAMpeil;
     }
@@ -556,7 +556,7 @@
     public Serializable getTeilB() {
         return this.teilB;
     }
-    
+
     public void setTeilB(Serializable teilB) {
         this.teilB = teilB;
     }
@@ -566,7 +566,7 @@
     public Serializable getTeilHm() {
         return this.teilHm;
     }
-    
+
     public void setTeilHm(Serializable teilHm) {
         this.teilHm = teilHm;
     }
@@ -576,7 +576,7 @@
     public Serializable getTeilVm() {
         return this.teilVm;
     }
-    
+
     public void setTeilVm(Serializable teilVm) {
         this.teilVm = teilVm;
     }
@@ -586,7 +586,7 @@
     public Serializable getTeilVsohle() {
         return this.teilVsohle;
     }
-    
+
     public void setTeilVsohle(Serializable teilVsohle) {
         this.teilVsohle = teilVsohle;
     }
@@ -596,7 +596,7 @@
     public Serializable getTeilTau() {
         return this.teilTau;
     }
-    
+
     public void setTeilTau(Serializable teilTau) {
         this.teilTau = teilTau;
     }
@@ -606,7 +606,7 @@
     public Serializable getTeilTauv() {
         return this.teilTauv;
     }
-    
+
     public void setTeilTauv(Serializable teilTauv) {
         this.teilTauv = teilTauv;
     }
@@ -616,7 +616,7 @@
     public Serializable getMitteltyp() {
         return this.mitteltyp;
     }
-    
+
     public void setMitteltyp(Serializable mitteltyp) {
         this.mitteltyp = mitteltyp;
     }
@@ -626,7 +626,7 @@
     public Serializable getDm() {
         return this.dm;
     }
-    
+
     public void setDm(Serializable dm) {
         this.dm = dm;
     }
@@ -636,7 +636,7 @@
     public Serializable getSk() {
         return this.sk;
     }
-    
+
     public void setSk(Serializable sk) {
         this.sk = sk;
     }
@@ -646,7 +646,7 @@
     public Serializable getSo() {
         return this.so;
     }
-    
+
     public void setSo(Serializable so) {
         this.so = so;
     }
@@ -656,7 +656,7 @@
     public Serializable getU() {
         return this.u;
     }
-    
+
     public void setU(Serializable u) {
         this.u = u;
     }
@@ -666,7 +666,7 @@
     public Serializable getD90() {
         return this.d90;
     }
-    
+
     public void setD90(Serializable d90) {
         this.d90 = d90;
     }
@@ -676,7 +676,7 @@
     public Serializable getD84() {
         return this.d84;
     }
-    
+
     public void setD84(Serializable d84) {
         this.d84 = d84;
     }
@@ -686,7 +686,7 @@
     public Serializable getD80() {
         return this.d80;
     }
-    
+
     public void setD80(Serializable d80) {
         this.d80 = d80;
     }
@@ -696,7 +696,7 @@
     public Serializable getD75() {
         return this.d75;
     }
-    
+
     public void setD75(Serializable d75) {
         this.d75 = d75;
     }
@@ -706,7 +706,7 @@
     public Serializable getD70() {
         return this.d70;
     }
-    
+
     public void setD70(Serializable d70) {
         this.d70 = d70;
     }
@@ -716,7 +716,7 @@
     public Serializable getD60() {
         return this.d60;
     }
-    
+
     public void setD60(Serializable d60) {
         this.d60 = d60;
     }
@@ -726,7 +726,7 @@
     public Serializable getD50() {
         return this.d50;
     }
-    
+
     public void setD50(Serializable d50) {
         this.d50 = d50;
     }
@@ -736,7 +736,7 @@
     public Serializable getD40() {
         return this.d40;
     }
-    
+
     public void setD40(Serializable d40) {
         this.d40 = d40;
     }
@@ -746,7 +746,7 @@
     public Serializable getD30() {
         return this.d30;
     }
-    
+
     public void setD30(Serializable d30) {
         this.d30 = d30;
     }
@@ -756,7 +756,7 @@
     public Serializable getD25() {
         return this.d25;
     }
-    
+
     public void setD25(Serializable d25) {
         this.d25 = d25;
     }
@@ -766,7 +766,7 @@
     public Serializable getD20() {
         return this.d20;
     }
-    
+
     public void setD20(Serializable d20) {
         this.d20 = d20;
     }
@@ -776,7 +776,7 @@
     public Serializable getD16() {
         return this.d16;
     }
-    
+
     public void setD16(Serializable d16) {
         this.d16 = d16;
     }
@@ -786,7 +786,7 @@
     public Serializable getD10() {
         return this.d10;
     }
-    
+
     public void setD10(Serializable d10) {
         this.d10 = d10;
     }
@@ -796,7 +796,7 @@
     public Serializable getDmin() {
         return this.dmin;
     }
-    
+
     public void setDmin(Serializable dmin) {
         this.dmin = dmin;
     }
@@ -806,7 +806,7 @@
     public Serializable getDurchdmin() {
         return this.durchdmin;
     }
-    
+
     public void setDurchdmin(Serializable durchdmin) {
         this.durchdmin = durchdmin;
     }
@@ -816,7 +816,7 @@
     public Serializable getDmax() {
         return this.dmax;
     }
-    
+
     public void setDmax(Serializable dmax) {
         this.dmax = dmax;
     }
@@ -826,7 +826,7 @@
     public Serializable getDurchdmax() {
         return this.durchdmax;
     }
-    
+
     public void setDurchdmax(Serializable durchdmax) {
         this.durchdmax = durchdmax;
     }
@@ -836,7 +836,7 @@
     public Serializable getNGeschieb() {
         return this.NGeschieb;
     }
-    
+
     public void setNGeschieb(Serializable NGeschieb) {
         this.NGeschieb = NGeschieb;
     }
@@ -846,7 +846,7 @@
     public Serializable getNVielpkt() {
         return this.NVielpkt;
     }
-    
+
     public void setNVielpkt(Serializable NVielpkt) {
         this.NVielpkt = NVielpkt;
     }
@@ -856,7 +856,7 @@
     public Serializable getSysDate() {
         return this.sysDate;
     }
-    
+
     public void setSysDate(Serializable sysDate) {
         this.sysDate = sysDate;
     }
@@ -866,7 +866,7 @@
     public Serializable getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(Serializable bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -876,7 +876,7 @@
     public Serializable getLastupdated() {
         return this.lastupdated;
     }
-    
+
     public void setLastupdated(Serializable lastupdated) {
         this.lastupdated = lastupdated;
     }
@@ -886,7 +886,7 @@
     public Serializable getKm() {
         return this.km;
     }
-    
+
     public void setKm(Serializable km) {
         this.km = km;
     }
@@ -896,7 +896,7 @@
     public Serializable getGlotabstoffset() {
         return this.glotabstoffset;
     }
-    
+
     public void setGlotabstoffset(Serializable glotabstoffset) {
         this.glotabstoffset = glotabstoffset;
     }
@@ -906,7 +906,7 @@
     public Serializable getSlotabstoffset() {
         return this.slotabstoffset;
     }
-    
+
     public void setSlotabstoffset(Serializable slotabstoffset) {
         this.slotabstoffset = slotabstoffset;
     }
@@ -916,7 +916,7 @@
     public Serializable getGbreitevonlinks() {
         return this.gbreitevonlinks;
     }
-    
+
     public void setGbreitevonlinks(Serializable gbreitevonlinks) {
         this.gbreitevonlinks = gbreitevonlinks;
     }
@@ -926,7 +926,7 @@
     public Serializable getGbreitebislinks() {
         return this.gbreitebislinks;
     }
-    
+
     public void setGbreitebislinks(Serializable gbreitebislinks) {
         this.gbreitebislinks = gbreitebislinks;
     }
@@ -936,7 +936,7 @@
     public Serializable getStaname() {
         return this.staname;
     }
-    
+
     public void setStaname(Serializable staname) {
         this.staname = staname;
     }
@@ -946,7 +946,7 @@
     public Serializable getStakm() {
         return this.stakm;
     }
-    
+
     public void setStakm(Serializable stakm) {
         this.stakm = stakm;
     }
@@ -956,7 +956,7 @@
     public Serializable getGewaesserid() {
         return this.gewaesserid;
     }
-    
+
     public void setGewaesserid(Serializable gewaesserid) {
         this.gewaesserid = gewaesserid;
     }
@@ -966,7 +966,7 @@
     public Serializable getGewname() {
         return this.gewname;
     }
-    
+
     public void setGewname(Serializable gewname) {
         this.gewname = gewname;
     }
@@ -976,7 +976,7 @@
     public Serializable getBezugspegelid() {
         return this.bezugspegelid;
     }
-    
+
     public void setBezugspegelid(Serializable bezugspegelid) {
         this.bezugspegelid = bezugspegelid;
     }
@@ -986,8 +986,8 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof MessungstaId) ) return false;
-         MessungstaId castOther = ( MessungstaId ) other; 
-         
+         MessungstaId castOther = ( MessungstaId ) other;
+
          return ( (this.getMessungid()==castOther.getMessungid()) || ( this.getMessungid()!=null && castOther.getMessungid()!=null && this.getMessungid().equals(castOther.getMessungid()) ) )
  && ( (this.getStationid()==castOther.getStationid()) || ( this.getStationid()!=null && castOther.getStationid()!=null && this.getStationid().equals(castOther.getStationid()) ) )
  && ( (this.getDatum()==castOther.getDatum()) || ( this.getDatum()!=null && castOther.getDatum()!=null && this.getDatum().equals(castOther.getDatum()) ) )
@@ -1069,10 +1069,10 @@
  && ( (this.getGewname()==castOther.getGewname()) || ( this.getGewname()!=null && castOther.getGewname()!=null && this.getGewname().equals(castOther.getGewname()) ) )
  && ( (this.getBezugspegelid()==castOther.getBezugspegelid()) || ( this.getBezugspegelid()!=null && castOther.getBezugspegelid()!=null && this.getBezugspegelid().equals(castOther.getBezugspegelid()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + ( getMessungid() == null ? 0 : this.getMessungid().hashCode() );
          result = 37 * result + ( getStationid() == null ? 0 : this.getStationid().hashCode() );
          result = 37 * result + ( getDatum() == null ? 0 : this.getDatum().hashCode() );
@@ -1154,5 +1154,5 @@
          result = 37 * result + ( getGewname() == null ? 0 : this.getGewname().hashCode() );
          result = 37 * result + ( getBezugspegelid() == null ? 0 : this.getBezugspegelid().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Messunguferbezug.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Messunguferbezug.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,18 +27,18 @@
     public Messunguferbezug(MessunguferbezugId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="uferistlinks", column=@Column(name="UFERISTLINKS", nullable=false, precision=1, scale=0) ), 
+        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="uferistlinks", column=@Column(name="UFERISTLINKS", nullable=false, precision=1, scale=0) ),
         @AttributeOverride(name="hmabst", column=@Column(name="HMABST", precision=8, scale=3) ) } )
     public MessunguferbezugId getId() {
         return this.id;
     }
-    
+
     public void setId(MessunguferbezugId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/MessunguferbezugId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/MessunguferbezugId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -29,14 +29,14 @@
        this.uferistlinks = uferistlinks;
        this.hmabst = hmabst;
     }
-   
+
 
 
     @Column(name="MESSUNGID", nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
@@ -46,7 +46,7 @@
     public boolean isUferistlinks() {
         return this.uferistlinks;
     }
-    
+
     public void setUferistlinks(boolean uferistlinks) {
         this.uferistlinks = uferistlinks;
     }
@@ -56,7 +56,7 @@
     public BigDecimal getHmabst() {
         return this.hmabst;
     }
-    
+
     public void setHmabst(BigDecimal hmabst) {
         this.hmabst = hmabst;
     }
@@ -66,19 +66,19 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof MessunguferbezugId) ) return false;
-         MessunguferbezugId castOther = ( MessunguferbezugId ) other; 
-         
+         MessunguferbezugId castOther = ( MessunguferbezugId ) other;
+
          return (this.getMessungid()==castOther.getMessungid())
  && (this.isUferistlinks()==castOther.isUferistlinks())
  && ( (this.getHmabst()==castOther.getHmabst()) || ( this.getHmabst()!=null && castOther.getHmabst()!=null && this.getHmabst().equals(castOther.getHmabst()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getMessungid();
          result = 37 * result + (this.isUferistlinks()?1:0);
          result = 37 * result + ( getHmabst() == null ? 0 : this.getHmabst().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilpunkt.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilpunkt.java	Fri Jun 15 09:20:49 2012 +0000
@@ -37,17 +37,17 @@
        this.y = y;
        this.z = z;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="mpeilungid", column=@Column(name="MPEILUNGID", nullable=false, precision=11, scale=0) ), 
+        @AttributeOverride(name="mpeilungid", column=@Column(name="MPEILUNGID", nullable=false, precision=11, scale=0) ),
         @AttributeOverride(name="punktnr", column=@Column(name="PUNKTNR", nullable=false, precision=5, scale=0) ) } )
     public MpeilpunktId getId() {
         return this.id;
     }
-    
+
     public void setId(MpeilpunktId id) {
         this.id = id;
     }
@@ -57,27 +57,27 @@
     public Mpeilung getMpeilung() {
         return this.mpeilung;
     }
-    
+
     public void setMpeilung(Mpeilung mpeilung) {
         this.mpeilung = mpeilung;
     }
 
-    
+
     @Column(name="Y", nullable=false, precision=8, scale=3)
     public BigDecimal getY() {
         return this.y;
     }
-    
+
     public void setY(BigDecimal y) {
         this.y = y;
     }
 
-    
+
     @Column(name="Z", nullable=false, precision=8, scale=3)
     public BigDecimal getZ() {
         return this.z;
     }
-    
+
     public void setZ(BigDecimal z) {
         this.z = z;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/MpeilpunktId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/MpeilpunktId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -22,14 +22,14 @@
        this.mpeilungid = mpeilungid;
        this.punktnr = punktnr;
     }
-   
+
 
 
     @Column(name="MPEILUNGID", nullable=false, precision=11, scale=0)
     public long getMpeilungid() {
         return this.mpeilungid;
     }
-    
+
     public void setMpeilungid(long mpeilungid) {
         this.mpeilungid = mpeilungid;
     }
@@ -39,7 +39,7 @@
     public int getPunktnr() {
         return this.punktnr;
     }
-    
+
     public void setPunktnr(int punktnr) {
         this.punktnr = punktnr;
     }
@@ -49,17 +49,17 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof MpeilpunktId) ) return false;
-         MpeilpunktId castOther = ( MpeilpunktId ) other; 
-         
+         MpeilpunktId castOther = ( MpeilpunktId ) other;
+
          return (this.getMpeilungid()==castOther.getMpeilungid())
  && (this.getPunktnr()==castOther.getPunktnr());
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getMpeilungid();
          result = 37 * result + this.getPunktnr();
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilung.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Mpeilung.java	Fri Jun 15 09:20:49 2012 +0000
@@ -56,15 +56,15 @@
        this.oldapeilid = oldapeilid;
        this.mpeilpunkts = mpeilpunkts;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="MPEILUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getMpeilungid() {
         return this.mpeilungid;
     }
-    
+
     public void setMpeilungid(long mpeilungid) {
         this.mpeilungid = mpeilungid;
     }
@@ -74,7 +74,7 @@
     public Station getStation() {
         return this.station;
     }
-    
+
     public void setStation(Station station) {
         this.station = station;
     }
@@ -84,27 +84,27 @@
     public Date getDatum() {
         return this.datum;
     }
-    
+
     public void setDatum(Date datum) {
         this.datum = datum;
     }
 
-    
+
     @Column(name="KM", nullable=false, precision=8, scale=3)
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -114,17 +114,17 @@
     public Date getLastupdated() {
         return this.lastupdated;
     }
-    
+
     public void setLastupdated(Date lastupdated) {
         this.lastupdated = lastupdated;
     }
 
-    
+
     @Column(name="OLDAPEILID", precision=11, scale=0)
     public Long getOldapeilid() {
         return this.oldapeilid;
     }
-    
+
     public void setOldapeilid(Long oldapeilid) {
         this.oldapeilid = oldapeilid;
     }
@@ -133,7 +133,7 @@
     public Set<Mpeilpunkt> getMpeilpunkts() {
         return this.mpeilpunkts;
     }
-    
+
     public void setMpeilpunkts(Set<Mpeilpunkt> mpeilpunkts) {
         this.mpeilpunkts = mpeilpunkts;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Probebild.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Probebild.java	Fri Jun 15 09:20:49 2012 +0000
@@ -59,15 +59,15 @@
        this.typmittel = typmittel;
        this.typgross = typgross;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="PROBEBILDID", unique=true, nullable=false, precision=11, scale=0)
     public long getProbebildid() {
         return this.probebildid;
     }
-    
+
     public void setProbebildid(long probebildid) {
         this.probebildid = probebildid;
     }
@@ -77,7 +77,7 @@
     public Zzthema getZzthema() {
         return this.zzthema;
     }
-    
+
     public void setZzthema(Zzthema zzthema) {
         this.zzthema = zzthema;
     }
@@ -87,107 +87,107 @@
     public Sohlprobe getSohlprobe() {
         return this.sohlprobe;
     }
-    
+
     public void setSohlprobe(Sohlprobe sohlprobe) {
         this.sohlprobe = sohlprobe;
     }
 
-    
+
     @Column(name="LFDNR", nullable=false, precision=5, scale=0)
     public int getLfdnr() {
         return this.lfdnr;
     }
-    
+
     public void setLfdnr(int lfdnr) {
         this.lfdnr = lfdnr;
     }
 
-    
+
     @Column(name="ISTDIGITAL", nullable=false, precision=1, scale=0)
     public boolean isIstdigital() {
         return this.istdigital;
     }
-    
+
     public void setIstdigital(boolean istdigital) {
         this.istdigital = istdigital;
     }
 
-    
+
     @Column(name="PFAD", length=512)
     public String getPfad() {
         return this.pfad;
     }
-    
+
     public void setPfad(String pfad) {
         this.pfad = pfad;
     }
 
-    
+
     @Column(name="STANDORT", length=50)
     public String getStandort() {
         return this.standort;
     }
-    
+
     public void setStandort(String standort) {
         this.standort = standort;
     }
 
-    
+
     @Column(name="MEDIUM", length=50)
     public String getMedium() {
         return this.medium;
     }
-    
+
     public void setMedium(String medium) {
         this.medium = medium;
     }
 
-    
+
     @Column(name="MEDPFAD", length=50)
     public String getMedpfad() {
         return this.medpfad;
     }
-    
+
     public void setMedpfad(String medpfad) {
         this.medpfad = medpfad;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
 
-    
+
     @Column(name="TYPKLEIN", length=8)
     public String getTypklein() {
         return this.typklein;
     }
-    
+
     public void setTypklein(String typklein) {
         this.typklein = typklein;
     }
 
-    
+
     @Column(name="TYPMITTEL", length=8)
     public String getTypmittel() {
         return this.typmittel;
     }
-    
+
     public void setTypmittel(String typmittel) {
         this.typmittel = typmittel;
     }
 
-    
+
     @Column(name="TYPGROSS", length=8)
     public String getTypgross() {
         return this.typgross;
     }
-    
+
     public void setTypgross(String typgross) {
         this.typgross = typgross;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Siebanalyse.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Siebanalyse.java	Fri Jun 15 09:20:49 2012 +0000
@@ -87,15 +87,15 @@
        this.bemerkung = bemerkung;
        this.ssiebung = ssiebung;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="SIEBANALYSEID", unique=true, nullable=false, precision=11, scale=0)
     public long getSiebanalyseid() {
         return this.siebanalyseid;
     }
-    
+
     public void setSiebanalyseid(long siebanalyseid) {
         this.siebanalyseid = siebanalyseid;
     }
@@ -105,247 +105,247 @@
     public Sohlprobe getSohlprobe() {
         return this.sohlprobe;
     }
-    
+
     public void setSohlprobe(Sohlprobe sohlprobe) {
         this.sohlprobe = sohlprobe;
     }
 
-    
+
     @Column(name="ISTDIGITAL", nullable=false, precision=1, scale=0)
     public boolean isIstdigital() {
         return this.istdigital;
     }
-    
+
     public void setIstdigital(boolean istdigital) {
         this.istdigital = istdigital;
     }
 
-    
+
     @Column(name="STANDORT", length=50)
     public String getStandort() {
         return this.standort;
     }
-    
+
     public void setStandort(String standort) {
         this.standort = standort;
     }
 
-    
+
     @Column(name="DM", precision=7, scale=4)
     public BigDecimal getDm() {
         return this.dm;
     }
-    
+
     public void setDm(BigDecimal dm) {
         this.dm = dm;
     }
 
-    
+
     @Column(name="SO", precision=8, scale=3)
     public BigDecimal getSo() {
         return this.so;
     }
-    
+
     public void setSo(BigDecimal so) {
         this.so = so;
     }
 
-    
+
     @Column(name="SK", precision=8, scale=3)
     public BigDecimal getSk() {
         return this.sk;
     }
-    
+
     public void setSk(BigDecimal sk) {
         this.sk = sk;
     }
 
-    
+
     @Column(name="U", precision=8, scale=3)
     public BigDecimal getU() {
         return this.u;
     }
-    
+
     public void setU(BigDecimal u) {
         this.u = u;
     }
 
-    
+
     @Column(name="D90", precision=7, scale=4)
     public BigDecimal getD90() {
         return this.d90;
     }
-    
+
     public void setD90(BigDecimal d90) {
         this.d90 = d90;
     }
 
-    
+
     @Column(name="D84", precision=7, scale=4)
     public BigDecimal getD84() {
         return this.d84;
     }
-    
+
     public void setD84(BigDecimal d84) {
         this.d84 = d84;
     }
 
-    
+
     @Column(name="D80", precision=7, scale=4)
     public BigDecimal getD80() {
         return this.d80;
     }
-    
+
     public void setD80(BigDecimal d80) {
         this.d80 = d80;
     }
 
-    
+
     @Column(name="D75", precision=7, scale=4)
     public BigDecimal getD75() {
         return this.d75;
     }
-    
+
     public void setD75(BigDecimal d75) {
         this.d75 = d75;
     }
 
-    
+
     @Column(name="D70", precision=7, scale=4)
     public BigDecimal getD70() {
         return this.d70;
     }
-    
+
     public void setD70(BigDecimal d70) {
         this.d70 = d70;
     }
 
-    
+
     @Column(name="D60", precision=7, scale=4)
     public BigDecimal getD60() {
         return this.d60;
     }
-    
+
     public void setD60(BigDecimal d60) {
         this.d60 = d60;
     }
 
-    
+
     @Column(name="D50", precision=7, scale=4)
     public BigDecimal getD50() {
         return this.d50;
     }
-    
+
     public void setD50(BigDecimal d50) {
         this.d50 = d50;
     }
 
-    
+
     @Column(name="D40", precision=7, scale=4)
     public BigDecimal getD40() {
         return this.d40;
     }
-    
+
     public void setD40(BigDecimal d40) {
         this.d40 = d40;
     }
 
-    
+
     @Column(name="D30", precision=7, scale=4)
     public BigDecimal getD30() {
         return this.d30;
     }
-    
+
     public void setD30(BigDecimal d30) {
         this.d30 = d30;
     }
 
-    
+
     @Column(name="D25", precision=7, scale=4)
     public BigDecimal getD25() {
         return this.d25;
     }
-    
+
     public void setD25(BigDecimal d25) {
         this.d25 = d25;
     }
 
-    
+
     @Column(name="D20", precision=7, scale=4)
     public BigDecimal getD20() {
         return this.d20;
     }
-    
+
     public void setD20(BigDecimal d20) {
         this.d20 = d20;
     }
 
-    
+
     @Column(name="D16", precision=7, scale=4)
     public BigDecimal getD16() {
         return this.d16;
     }
-    
+
     public void setD16(BigDecimal d16) {
         this.d16 = d16;
     }
 
-    
+
     @Column(name="D10", precision=7, scale=4)
     public BigDecimal getD10() {
         return this.d10;
     }
-    
+
     public void setD10(BigDecimal d10) {
         this.d10 = d10;
     }
 
-    
+
     @Column(name="DMIN", precision=7, scale=4)
     public BigDecimal getDmin() {
         return this.dmin;
     }
-    
+
     public void setDmin(BigDecimal dmin) {
         this.dmin = dmin;
     }
 
-    
+
     @Column(name="DURCHDMIN", precision=6, scale=3)
     public BigDecimal getDurchdmin() {
         return this.durchdmin;
     }
-    
+
     public void setDurchdmin(BigDecimal durchdmin) {
         this.durchdmin = durchdmin;
     }
 
-    
+
     @Column(name="DMAX", precision=7, scale=4)
     public BigDecimal getDmax() {
         return this.dmax;
     }
-    
+
     public void setDmax(BigDecimal dmax) {
         this.dmax = dmax;
     }
 
-    
+
     @Column(name="DURCHDMAX", precision=6, scale=3)
     public BigDecimal getDurchdmax() {
         return this.durchdmax;
     }
-    
+
     public void setDurchdmax(BigDecimal durchdmax) {
         this.durchdmax = durchdmax;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -354,7 +354,7 @@
     public Ssiebung getSsiebung() {
         return this.ssiebung;
     }
-    
+
     public void setSsiebung(Ssiebung ssiebung) {
         this.ssiebung = ssiebung;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Slotlinks.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Slotlinks.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,26 +27,26 @@
     public Slotlinks(SlotlinksId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
     @AttributeOverrides( {
-        @AttributeOverride(name="slotrechteid", column=@Column(name="SLOTRECHTEID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="uferabst", column=@Column(name="UFERABST", nullable=false, precision=8, scale=3) ), 
-        @AttributeOverride(name="tsand", column=@Column(name="TSAND", precision=8, scale=3) ), 
-        @AttributeOverride(name="tschweb", column=@Column(name="TSCHWEB", precision=8, scale=3) ), 
-        @AttributeOverride(name="fv", column=@Column(name="FV", precision=6, scale=3) ), 
-        @AttributeOverride(name="vm", column=@Column(name="VM", precision=6, scale=4) ), 
-        @AttributeOverride(name="tiefe", column=@Column(name="TIEFE", precision=8, scale=3) ), 
-        @AttributeOverride(name="vsohle", column=@Column(name="VSOHLE", precision=6, scale=4) ), 
-        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ), 
-        @AttributeOverride(name="uferablinks", column=@Column(name="UFERABLINKS", precision=8, scale=3) ), 
+        @AttributeOverride(name="slotrechteid", column=@Column(name="SLOTRECHTEID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="messungid", column=@Column(name="MESSUNGID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="uferabst", column=@Column(name="UFERABST", nullable=false, precision=8, scale=3) ),
+        @AttributeOverride(name="tsand", column=@Column(name="TSAND", precision=8, scale=3) ),
+        @AttributeOverride(name="tschweb", column=@Column(name="TSCHWEB", precision=8, scale=3) ),
+        @AttributeOverride(name="fv", column=@Column(name="FV", precision=6, scale=3) ),
+        @AttributeOverride(name="vm", column=@Column(name="VM", precision=6, scale=4) ),
+        @AttributeOverride(name="tiefe", column=@Column(name="TIEFE", precision=8, scale=3) ),
+        @AttributeOverride(name="vsohle", column=@Column(name="VSOHLE", precision=6, scale=4) ),
+        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ),
+        @AttributeOverride(name="uferablinks", column=@Column(name="UFERABLINKS", precision=8, scale=3) ),
         @AttributeOverride(name="linksabst", column=@Column(name="LINKSABST", precision=22, scale=0) ) } )
     public SlotlinksId getId() {
         return this.id;
     }
-    
+
     public void setId(SlotlinksId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/SlotlinksId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/SlotlinksId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -48,14 +48,14 @@
        this.uferablinks = uferablinks;
        this.linksabst = linksabst;
     }
-   
+
 
 
     @Column(name="SLOTRECHTEID", nullable=false, precision=11, scale=0)
     public long getSlotrechteid() {
         return this.slotrechteid;
     }
-    
+
     public void setSlotrechteid(long slotrechteid) {
         this.slotrechteid = slotrechteid;
     }
@@ -65,7 +65,7 @@
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
@@ -75,7 +75,7 @@
     public BigDecimal getUferabst() {
         return this.uferabst;
     }
-    
+
     public void setUferabst(BigDecimal uferabst) {
         this.uferabst = uferabst;
     }
@@ -85,7 +85,7 @@
     public BigDecimal getTsand() {
         return this.tsand;
     }
-    
+
     public void setTsand(BigDecimal tsand) {
         this.tsand = tsand;
     }
@@ -95,7 +95,7 @@
     public BigDecimal getTschweb() {
         return this.tschweb;
     }
-    
+
     public void setTschweb(BigDecimal tschweb) {
         this.tschweb = tschweb;
     }
@@ -105,7 +105,7 @@
     public BigDecimal getFv() {
         return this.fv;
     }
-    
+
     public void setFv(BigDecimal fv) {
         this.fv = fv;
     }
@@ -115,7 +115,7 @@
     public BigDecimal getVm() {
         return this.vm;
     }
-    
+
     public void setVm(BigDecimal vm) {
         this.vm = vm;
     }
@@ -125,7 +125,7 @@
     public BigDecimal getTiefe() {
         return this.tiefe;
     }
-    
+
     public void setTiefe(BigDecimal tiefe) {
         this.tiefe = tiefe;
     }
@@ -135,7 +135,7 @@
     public BigDecimal getVsohle() {
         return this.vsohle;
     }
-    
+
     public void setVsohle(BigDecimal vsohle) {
         this.vsohle = vsohle;
     }
@@ -145,7 +145,7 @@
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -155,7 +155,7 @@
     public BigDecimal getUferablinks() {
         return this.uferablinks;
     }
-    
+
     public void setUferablinks(BigDecimal uferablinks) {
         this.uferablinks = uferablinks;
     }
@@ -165,7 +165,7 @@
     public BigDecimal getLinksabst() {
         return this.linksabst;
     }
-    
+
     public void setLinksabst(BigDecimal linksabst) {
         this.linksabst = linksabst;
     }
@@ -175,8 +175,8 @@
          if ( (this == other ) ) return true;
 		 if ( (other == null ) ) return false;
 		 if ( !(other instanceof SlotlinksId) ) return false;
-		 SlotlinksId castOther = ( SlotlinksId ) other; 
-         
+		 SlotlinksId castOther = ( SlotlinksId ) other;
+
 		 return (this.getSlotrechteid()==castOther.getSlotrechteid())
  && (this.getMessungid()==castOther.getMessungid())
  && ( (this.getUferabst()==castOther.getUferabst()) || ( this.getUferabst()!=null && castOther.getUferabst()!=null && this.getUferabst().equals(castOther.getUferabst()) ) )
@@ -190,10 +190,10 @@
  && ( (this.getUferablinks()==castOther.getUferablinks()) || ( this.getUferablinks()!=null && castOther.getUferablinks()!=null && this.getUferablinks().equals(castOther.getUferablinks()) ) )
  && ( (this.getLinksabst()==castOther.getLinksabst()) || ( this.getLinksabst()!=null && castOther.getLinksabst()!=null && this.getLinksabst().equals(castOther.getLinksabst()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getSlotrechteid();
          result = 37 * result + (int) this.getMessungid();
          result = 37 * result + ( getUferabst() == null ? 0 : this.getUferabst().hashCode() );
@@ -207,5 +207,5 @@
          result = 37 * result + ( getUferablinks() == null ? 0 : this.getUferablinks().hashCode() );
          result = 37 * result + ( getLinksabst() == null ? 0 : this.getLinksabst().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Slotrechte.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Slotrechte.java	Fri Jun 15 09:20:49 2012 +0000
@@ -59,15 +59,15 @@
        this.uferablinks = uferablinks;
        this.sprobes = sprobes;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="SLOTRECHTEID", unique=true, nullable=false, precision=11, scale=0)
     public long getSlotrechteid() {
         return this.slotrechteid;
     }
-    
+
     public void setSlotrechteid(long slotrechteid) {
         this.slotrechteid = slotrechteid;
     }
@@ -77,97 +77,97 @@
     public Messung getMessung() {
         return this.messung;
     }
-    
+
     public void setMessung(Messung messung) {
         this.messung = messung;
     }
 
-    
+
     @Column(name="UFERABST", nullable=false, precision=8, scale=3)
     public BigDecimal getUferabst() {
         return this.uferabst;
     }
-    
+
     public void setUferabst(BigDecimal uferabst) {
         this.uferabst = uferabst;
     }
 
-    
+
     @Column(name="TSAND", precision=8, scale=3)
     public BigDecimal getTsand() {
         return this.tsand;
     }
-    
+
     public void setTsand(BigDecimal tsand) {
         this.tsand = tsand;
     }
 
-    
+
     @Column(name="TSCHWEB", precision=8, scale=3)
     public BigDecimal getTschweb() {
         return this.tschweb;
     }
-    
+
     public void setTschweb(BigDecimal tschweb) {
         this.tschweb = tschweb;
     }
 
-    
+
     @Column(name="FV", precision=6, scale=3)
     public BigDecimal getFv() {
         return this.fv;
     }
-    
+
     public void setFv(BigDecimal fv) {
         this.fv = fv;
     }
 
-    
+
     @Column(name="VM", precision=6, scale=4)
     public BigDecimal getVm() {
         return this.vm;
     }
-    
+
     public void setVm(BigDecimal vm) {
         this.vm = vm;
     }
 
-    
+
     @Column(name="TIEFE", precision=8, scale=3)
     public BigDecimal getTiefe() {
         return this.tiefe;
     }
-    
+
     public void setTiefe(BigDecimal tiefe) {
         this.tiefe = tiefe;
     }
 
-    
+
     @Column(name="VSOHLE", precision=6, scale=4)
     public BigDecimal getVsohle() {
         return this.vsohle;
     }
-    
+
     public void setVsohle(BigDecimal vsohle) {
         this.vsohle = vsohle;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
 
-    
+
     @Column(name="UFERABLINKS", precision=8, scale=3)
     public BigDecimal getUferablinks() {
         return this.uferablinks;
     }
-    
+
     public void setUferablinks(BigDecimal uferablinks) {
         this.uferablinks = uferablinks;
     }
@@ -176,7 +176,7 @@
     public Set<Sprobe> getSprobes() {
         return this.sprobes;
     }
-    
+
     public void setSprobes(Set<Sprobe> sprobes) {
         this.sprobes = sprobes;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Sohlprobe.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Sohlprobe.java	Fri Jun 15 09:20:49 2012 +0000
@@ -57,15 +57,15 @@
        this.probebilds = probebilds;
        this.siebanalyses = siebanalyses;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="SOHLPROBEID", unique=true, nullable=false, precision=11, scale=0)
     public long getSohlprobeid() {
         return this.sohlprobeid;
     }
-    
+
     public void setSohlprobeid(long sohlprobeid) {
         this.sohlprobeid = sohlprobeid;
     }
@@ -75,7 +75,7 @@
     public Zzprobenahmeart getZzprobenahmeart() {
         return this.zzprobenahmeart;
     }
-    
+
     public void setZzprobenahmeart(Zzprobenahmeart zzprobenahmeart) {
         this.zzprobenahmeart = zzprobenahmeart;
     }
@@ -85,37 +85,37 @@
     public Sohltest getSohltest() {
         return this.sohltest;
     }
-    
+
     public void setSohltest(Sohltest sohltest) {
         this.sohltest = sohltest;
     }
 
-    
+
     @Column(name="TIEFEVON", precision=8, scale=3)
     public BigDecimal getTiefevon() {
         return this.tiefevon;
     }
-    
+
     public void setTiefevon(BigDecimal tiefevon) {
         this.tiefevon = tiefevon;
     }
 
-    
+
     @Column(name="TIEFEBIS", precision=8, scale=3)
     public BigDecimal getTiefebis() {
         return this.tiefebis;
     }
-    
+
     public void setTiefebis(BigDecimal tiefebis) {
         this.tiefebis = tiefebis;
     }
 
-    
+
     @Column(name="BESCHREIBUNG", length=1024)
     public String getBeschreibung() {
         return this.beschreibung;
     }
-    
+
     public void setBeschreibung(String beschreibung) {
         this.beschreibung = beschreibung;
     }
@@ -125,7 +125,7 @@
     public Date getLastupdated() {
         return this.lastupdated;
     }
-    
+
     public void setLastupdated(Date lastupdated) {
         this.lastupdated = lastupdated;
     }
@@ -134,7 +134,7 @@
     public Set<Probebild> getProbebilds() {
         return this.probebilds;
     }
-    
+
     public void setProbebilds(Set<Probebild> probebilds) {
         this.probebilds = probebilds;
     }
@@ -143,7 +143,7 @@
     public Set<Siebanalyse> getSiebanalyses() {
         return this.siebanalyses;
     }
-    
+
     public void setSiebanalyses(Set<Siebanalyse> siebanalyses) {
         this.siebanalyses = siebanalyses;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Sohltest.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Sohltest.java	Fri Jun 15 09:20:49 2012 +0000
@@ -51,7 +51,7 @@
     public Sohltest() {
     }
 
-	
+
     public Sohltest(long sohltestid, Station station, Date datum, boolean istnurjahr, BigDecimal abstand, boolean abstistvonlinks, boolean abstbezug, BigDecimal abstoffset, Date lastupdated) {
         this.sohltestid = sohltestid;
         this.station = station;
@@ -86,15 +86,15 @@
        this.bilds = bilds;
        this.sohlprobes = sohlprobes;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="SOHLTESTID", unique=true, nullable=false, precision=11, scale=0)
     public long getSohltestid() {
         return this.sohltestid;
     }
-    
+
     public void setSohltestid(long sohltestid) {
         this.sohltestid = sohltestid;
     }
@@ -104,7 +104,7 @@
     public Station getStation() {
         return this.station;
     }
-    
+
     public void setStation(Station station) {
         this.station = station;
     }
@@ -114,7 +114,7 @@
     public Zzsondierungart getZzsondierungart() {
         return this.zzsondierungart;
     }
-    
+
     public void setZzsondierungart(Zzsondierungart zzsondierungart) {
         this.zzsondierungart = zzsondierungart;
     }
@@ -124,7 +124,7 @@
     public Zzarchiv getZzarchiv() {
         return this.zzarchiv;
     }
-    
+
     public void setZzarchiv(Zzarchiv zzarchiv) {
         this.zzarchiv = zzarchiv;
     }
@@ -134,137 +134,137 @@
     public Date getDatum() {
         return this.datum;
     }
-    
+
     public void setDatum(Date datum) {
         this.datum = datum;
     }
 
-    
+
     @Column(name="ISTNURJAHR", nullable=false, precision=1, scale=0)
     public boolean isIstnurjahr() {
         return this.istnurjahr;
     }
-    
+
     public void setIstnurjahr(boolean istnurjahr) {
         this.istnurjahr = istnurjahr;
     }
 
-    
+
     @Column(name="KM", precision=8, scale=3)
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
 
-    
+
     @Column(name="ABSTAND", nullable=false, precision=8, scale=3)
     public BigDecimal getAbstand() {
         return this.abstand;
     }
-    
+
     public void setAbstand(BigDecimal abstand) {
         this.abstand = abstand;
     }
 
-    
+
     @Column(name="ABSTISTVONLINKS", nullable=false, precision=1, scale=0)
     public boolean isAbstistvonlinks() {
         return this.abstistvonlinks;
     }
-    
+
     public void setAbstistvonlinks(boolean abstistvonlinks) {
         this.abstistvonlinks = abstistvonlinks;
     }
 
-    
+
     @Column(name="ABSTBEZUG", nullable=false, precision=1, scale=0)
     public boolean isAbstbezug() {
         return this.abstbezug;
     }
-    
+
     public void setAbstbezug(boolean abstbezug) {
         this.abstbezug = abstbezug;
     }
 
-    
+
     @Column(name="ABSTOFFSET", nullable=false, precision=8, scale=3)
     public BigDecimal getAbstoffset() {
         return this.abstoffset;
     }
-    
+
     public void setAbstoffset(BigDecimal abstoffset) {
         this.abstoffset = abstoffset;
     }
 
-    
+
     @Column(name="ABSTLINKS", precision=8, scale=3)
     public BigDecimal getAbstlinks() {
         return this.abstlinks;
     }
-    
+
     public void setAbstlinks(BigDecimal abstlinks) {
         this.abstlinks = abstlinks;
     }
 
-    
+
     @Column(name="RECHTS", precision=11, scale=3)
     public BigDecimal getRechts() {
         return this.rechts;
     }
-    
+
     public void setRechts(BigDecimal rechts) {
         this.rechts = rechts;
     }
 
-    
+
     @Column(name="HOCH", precision=11, scale=3)
     public BigDecimal getHoch() {
         return this.hoch;
     }
-    
+
     public void setHoch(BigDecimal hoch) {
         this.hoch = hoch;
     }
 
-    
+
     @Column(name="HOEHE", precision=8, scale=3)
     public BigDecimal getHoehe() {
         return this.hoehe;
     }
-    
+
     public void setHoehe(BigDecimal hoehe) {
         this.hoehe = hoehe;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
 
-    
+
     @Column(name="SOHLEBESCHREIB", length=1024)
     public String getSohlebeschreib() {
         return this.sohlebeschreib;
     }
-    
+
     public void setSohlebeschreib(String sohlebeschreib) {
         this.sohlebeschreib = sohlebeschreib;
     }
 
-    
+
     @Column(name="SONDIERUNGBESCHREIB", length=1024)
     public String getSondierungbeschreib() {
         return this.sondierungbeschreib;
     }
-    
+
     public void setSondierungbeschreib(String sondierungbeschreib) {
         this.sondierungbeschreib = sondierungbeschreib;
     }
@@ -274,7 +274,7 @@
     public Date getLastupdated() {
         return this.lastupdated;
     }
-    
+
     public void setLastupdated(Date lastupdated) {
         this.lastupdated = lastupdated;
     }
@@ -283,7 +283,7 @@
     public Set<Bild> getBilds() {
         return this.bilds;
     }
-    
+
     public void setBilds(Set<Bild> bilds) {
         this.bilds = bilds;
     }
@@ -292,7 +292,7 @@
     public Set<Sohlprobe> getSohlprobes() {
         return this.sohlprobes;
     }
-    
+
     public void setSohlprobes(Set<Sohlprobe> sohlprobes) {
         this.sohlprobes = sohlprobes;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Sprobe.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Sprobe.java	Fri Jun 15 09:20:49 2012 +0000
@@ -36,7 +36,7 @@
     public Sprobe() {
     }
 
-	
+
     public Sprobe(SprobeId id, Slotrechte slotrechte, short wprozpkt, BigDecimal wpkt, BigDecimal vpkt, BigDecimal csandpkt, BigDecimal cschwebpkt) {
         this.id = id;
         this.slotrechte = slotrechte;
@@ -57,17 +57,17 @@
        this.sandtrieb = sandtrieb;
        this.schwebtrieb = schwebtrieb;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="slotrechteid", column=@Column(name="SLOTRECHTEID", nullable=false, precision=11, scale=0) ), 
+        @AttributeOverride(name="slotrechteid", column=@Column(name="SLOTRECHTEID", nullable=false, precision=11, scale=0) ),
         @AttributeOverride(name="lfdnr", column=@Column(name="LFDNR", nullable=false, precision=5, scale=0) ) } )
     public SprobeId getId() {
         return this.id;
     }
-    
+
     public void setId(SprobeId id) {
         this.id = id;
     }
@@ -77,77 +77,77 @@
     public Slotrechte getSlotrechte() {
         return this.slotrechte;
     }
-    
+
     public void setSlotrechte(Slotrechte slotrechte) {
         this.slotrechte = slotrechte;
     }
 
-    
+
     @Column(name="WPROZPKT", nullable=false, precision=3, scale=0)
     public short getWprozpkt() {
         return this.wprozpkt;
     }
-    
+
     public void setWprozpkt(short wprozpkt) {
         this.wprozpkt = wprozpkt;
     }
 
-    
+
     @Column(name="WPKT", nullable=false, precision=8, scale=3)
     public BigDecimal getWpkt() {
         return this.wpkt;
     }
-    
+
     public void setWpkt(BigDecimal wpkt) {
         this.wpkt = wpkt;
     }
 
-    
+
     @Column(name="VPKT", nullable=false, precision=6, scale=4)
     public BigDecimal getVpkt() {
         return this.vpkt;
     }
-    
+
     public void setVpkt(BigDecimal vpkt) {
         this.vpkt = vpkt;
     }
 
-    
+
     @Column(name="CSANDPKT", nullable=false, precision=8, scale=3)
     public BigDecimal getCsandpkt() {
         return this.csandpkt;
     }
-    
+
     public void setCsandpkt(BigDecimal csandpkt) {
         this.csandpkt = csandpkt;
     }
 
-    
+
     @Column(name="CSCHWEBPKT", nullable=false, precision=8, scale=3)
     public BigDecimal getCschwebpkt() {
         return this.cschwebpkt;
     }
-    
+
     public void setCschwebpkt(BigDecimal cschwebpkt) {
         this.cschwebpkt = cschwebpkt;
     }
 
-    
+
     @Column(name="SANDTRIEB", precision=8, scale=3)
     public BigDecimal getSandtrieb() {
         return this.sandtrieb;
     }
-    
+
     public void setSandtrieb(BigDecimal sandtrieb) {
         this.sandtrieb = sandtrieb;
     }
 
-    
+
     @Column(name="SCHWEBTRIEB", precision=8, scale=3)
     public BigDecimal getSchwebtrieb() {
         return this.schwebtrieb;
     }
-    
+
     public void setSchwebtrieb(BigDecimal schwebtrieb) {
         this.schwebtrieb = schwebtrieb;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/SprobeId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/SprobeId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -22,14 +22,14 @@
        this.slotrechteid = slotrechteid;
        this.lfdnr = lfdnr;
     }
-   
+
 
 
     @Column(name="SLOTRECHTEID", nullable=false, precision=11, scale=0)
     public long getSlotrechteid() {
         return this.slotrechteid;
     }
-    
+
     public void setSlotrechteid(long slotrechteid) {
         this.slotrechteid = slotrechteid;
     }
@@ -39,7 +39,7 @@
     public int getLfdnr() {
         return this.lfdnr;
     }
-    
+
     public void setLfdnr(int lfdnr) {
         this.lfdnr = lfdnr;
     }
@@ -49,17 +49,17 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof SprobeId) ) return false;
-         SprobeId castOther = ( SprobeId ) other; 
-         
+         SprobeId castOther = ( SprobeId ) other;
+
          return (this.getSlotrechteid()==castOther.getSlotrechteid())
  && (this.getLfdnr()==castOther.getLfdnr());
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getSlotrechteid();
          result = 37 * result + this.getLfdnr();
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebung.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebung.java	Fri Jun 15 09:20:49 2012 +0000
@@ -87,15 +87,15 @@
        this.rsieb21 = rsieb21;
        this.rest = rest;
     }
-   
+
      @GenericGenerator(name="generator", strategy="foreign", parameters=@Parameter(name="property", value="siebanalyse"))@Id @GeneratedValue(generator="generator")
 
-    
+
     @Column(name="SIEBANALYSEID", unique=true, nullable=false, precision=11, scale=0)
     public long getSiebanalyseid() {
         return this.siebanalyseid;
     }
-    
+
     public void setSiebanalyseid(long siebanalyseid) {
         this.siebanalyseid = siebanalyseid;
     }
@@ -104,7 +104,7 @@
     public Siebanalyse getSiebanalyse() {
         return this.siebanalyse;
     }
-    
+
     public void setSiebanalyse(Siebanalyse siebanalyse) {
         this.siebanalyse = siebanalyse;
     }
@@ -114,237 +114,237 @@
     public Gsiebsatz getGsiebsatz() {
         return this.gsiebsatz;
     }
-    
+
     public void setGsiebsatz(Gsiebsatz gsiebsatz) {
         this.gsiebsatz = gsiebsatz;
     }
 
-    
+
     @Column(name="GMASSE", precision=9, scale=3)
     public BigDecimal getGmasse() {
         return this.gmasse;
     }
-    
+
     public void setGmasse(BigDecimal gmasse) {
         this.gmasse = gmasse;
     }
 
-    
+
     @Column(name="RSIEB01", precision=9, scale=3)
     public BigDecimal getRsieb01() {
         return this.rsieb01;
     }
-    
+
     public void setRsieb01(BigDecimal rsieb01) {
         this.rsieb01 = rsieb01;
     }
 
-    
+
     @Column(name="RSIEB02", precision=9, scale=3)
     public BigDecimal getRsieb02() {
         return this.rsieb02;
     }
-    
+
     public void setRsieb02(BigDecimal rsieb02) {
         this.rsieb02 = rsieb02;
     }
 
-    
+
     @Column(name="RSIEB03", precision=9, scale=3)
     public BigDecimal getRsieb03() {
         return this.rsieb03;
     }
-    
+
     public void setRsieb03(BigDecimal rsieb03) {
         this.rsieb03 = rsieb03;
     }
 
-    
+
     @Column(name="RSIEB04", precision=9, scale=3)
     public BigDecimal getRsieb04() {
         return this.rsieb04;
     }
-    
+
     public void setRsieb04(BigDecimal rsieb04) {
         this.rsieb04 = rsieb04;
     }
 
-    
+
     @Column(name="RSIEB05", precision=9, scale=3)
     public BigDecimal getRsieb05() {
         return this.rsieb05;
     }
-    
+
     public void setRsieb05(BigDecimal rsieb05) {
         this.rsieb05 = rsieb05;
     }
 
-    
+
     @Column(name="RSIEB06", precision=9, scale=3)
     public BigDecimal getRsieb06() {
         return this.rsieb06;
     }
-    
+
     public void setRsieb06(BigDecimal rsieb06) {
         this.rsieb06 = rsieb06;
     }
 
-    
+
     @Column(name="RSIEB07", precision=9, scale=3)
     public BigDecimal getRsieb07() {
         return this.rsieb07;
     }
-    
+
     public void setRsieb07(BigDecimal rsieb07) {
         this.rsieb07 = rsieb07;
     }
 
-    
+
     @Column(name="RSIEB08", precision=9, scale=3)
     public BigDecimal getRsieb08() {
         return this.rsieb08;
     }
-    
+
     public void setRsieb08(BigDecimal rsieb08) {
         this.rsieb08 = rsieb08;
     }
 
-    
+
     @Column(name="RSIEB09", precision=9, scale=3)
     public BigDecimal getRsieb09() {
         return this.rsieb09;
     }
-    
+
     public void setRsieb09(BigDecimal rsieb09) {
         this.rsieb09 = rsieb09;
     }
 
-    
+
     @Column(name="RSIEB10", precision=9, scale=3)
     public BigDecimal getRsieb10() {
         return this.rsieb10;
     }
-    
+
     public void setRsieb10(BigDecimal rsieb10) {
         this.rsieb10 = rsieb10;
     }
 
-    
+
     @Column(name="RSIEB11", precision=9, scale=3)
     public BigDecimal getRsieb11() {
         return this.rsieb11;
     }
-    
+
     public void setRsieb11(BigDecimal rsieb11) {
         this.rsieb11 = rsieb11;
     }
 
-    
+
     @Column(name="RSIEB12", precision=9, scale=3)
     public BigDecimal getRsieb12() {
         return this.rsieb12;
     }
-    
+
     public void setRsieb12(BigDecimal rsieb12) {
         this.rsieb12 = rsieb12;
     }
 
-    
+
     @Column(name="RSIEB13", precision=9, scale=3)
     public BigDecimal getRsieb13() {
         return this.rsieb13;
     }
-    
+
     public void setRsieb13(BigDecimal rsieb13) {
         this.rsieb13 = rsieb13;
     }
 
-    
+
     @Column(name="RSIEB14", precision=9, scale=3)
     public BigDecimal getRsieb14() {
         return this.rsieb14;
     }
-    
+
     public void setRsieb14(BigDecimal rsieb14) {
         this.rsieb14 = rsieb14;
     }
 
-    
+
     @Column(name="RSIEB15", precision=9, scale=3)
     public BigDecimal getRsieb15() {
         return this.rsieb15;
     }
-    
+
     public void setRsieb15(BigDecimal rsieb15) {
         this.rsieb15 = rsieb15;
     }
 
-    
+
     @Column(name="RSIEB16", precision=9, scale=3)
     public BigDecimal getRsieb16() {
         return this.rsieb16;
     }
-    
+
     public void setRsieb16(BigDecimal rsieb16) {
         this.rsieb16 = rsieb16;
     }
 
-    
+
     @Column(name="RSIEB17", precision=9, scale=3)
     public BigDecimal getRsieb17() {
         return this.rsieb17;
     }
-    
+
     public void setRsieb17(BigDecimal rsieb17) {
         this.rsieb17 = rsieb17;
     }
 
-    
+
     @Column(name="RSIEB18", precision=9, scale=3)
     public BigDecimal getRsieb18() {
         return this.rsieb18;
     }
-    
+
     public void setRsieb18(BigDecimal rsieb18) {
         this.rsieb18 = rsieb18;
     }
 
-    
+
     @Column(name="RSIEB19", precision=9, scale=3)
     public BigDecimal getRsieb19() {
         return this.rsieb19;
     }
-    
+
     public void setRsieb19(BigDecimal rsieb19) {
         this.rsieb19 = rsieb19;
     }
 
-    
+
     @Column(name="RSIEB20", precision=9, scale=3)
     public BigDecimal getRsieb20() {
         return this.rsieb20;
     }
-    
+
     public void setRsieb20(BigDecimal rsieb20) {
         this.rsieb20 = rsieb20;
     }
 
-    
+
     @Column(name="RSIEB21", precision=9, scale=3)
     public BigDecimal getRsieb21() {
         return this.rsieb21;
     }
-    
+
     public void setRsieb21(BigDecimal rsieb21) {
         this.rsieb21 = rsieb21;
     }
 
-    
+
     @Column(name="REST", precision=9, scale=3)
     public BigDecimal getRest() {
         return this.rest;
     }
-    
+
     public void setRest(BigDecimal rest) {
         this.rest = rest;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebungsieb.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Ssiebungsieb.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,61 +27,61 @@
     public Ssiebungsieb(SsiebungsiebId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="siebanalyseid", column=@Column(name="SIEBANALYSEID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="gsiebsatzid", column=@Column(name="GSIEBSATZID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="gmasse", column=@Column(name="GMASSE", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche01", column=@Column(name="MASCHE01", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck01", column=@Column(name="RUECK01", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche02", column=@Column(name="MASCHE02", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck02", column=@Column(name="RUECK02", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche03", column=@Column(name="MASCHE03", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck03", column=@Column(name="RUECK03", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche04", column=@Column(name="MASCHE04", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck04", column=@Column(name="RUECK04", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche05", column=@Column(name="MASCHE05", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck05", column=@Column(name="RUECK05", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche06", column=@Column(name="MASCHE06", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck06", column=@Column(name="RUECK06", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche07", column=@Column(name="MASCHE07", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck07", column=@Column(name="RUECK07", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche08", column=@Column(name="MASCHE08", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck08", column=@Column(name="RUECK08", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche09", column=@Column(name="MASCHE09", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck09", column=@Column(name="RUECK09", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche10", column=@Column(name="MASCHE10", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck10", column=@Column(name="RUECK10", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche11", column=@Column(name="MASCHE11", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck11", column=@Column(name="RUECK11", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche12", column=@Column(name="MASCHE12", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck12", column=@Column(name="RUECK12", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche13", column=@Column(name="MASCHE13", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck13", column=@Column(name="RUECK13", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche14", column=@Column(name="MASCHE14", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck14", column=@Column(name="RUECK14", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche15", column=@Column(name="MASCHE15", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck15", column=@Column(name="RUECK15", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche16", column=@Column(name="MASCHE16", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck16", column=@Column(name="RUECK16", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche17", column=@Column(name="MASCHE17", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck17", column=@Column(name="RUECK17", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche18", column=@Column(name="MASCHE18", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck18", column=@Column(name="RUECK18", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche19", column=@Column(name="MASCHE19", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck19", column=@Column(name="RUECK19", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche20", column=@Column(name="MASCHE20", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck20", column=@Column(name="RUECK20", precision=9, scale=3) ), 
-        @AttributeOverride(name="masche21", column=@Column(name="MASCHE21", precision=7, scale=4) ), 
-        @AttributeOverride(name="rueck21", column=@Column(name="RUECK21", precision=9, scale=3) ), 
+        @AttributeOverride(name="siebanalyseid", column=@Column(name="SIEBANALYSEID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="gsiebsatzid", column=@Column(name="GSIEBSATZID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="gmasse", column=@Column(name="GMASSE", precision=9, scale=3) ),
+        @AttributeOverride(name="masche01", column=@Column(name="MASCHE01", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck01", column=@Column(name="RUECK01", precision=9, scale=3) ),
+        @AttributeOverride(name="masche02", column=@Column(name="MASCHE02", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck02", column=@Column(name="RUECK02", precision=9, scale=3) ),
+        @AttributeOverride(name="masche03", column=@Column(name="MASCHE03", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck03", column=@Column(name="RUECK03", precision=9, scale=3) ),
+        @AttributeOverride(name="masche04", column=@Column(name="MASCHE04", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck04", column=@Column(name="RUECK04", precision=9, scale=3) ),
+        @AttributeOverride(name="masche05", column=@Column(name="MASCHE05", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck05", column=@Column(name="RUECK05", precision=9, scale=3) ),
+        @AttributeOverride(name="masche06", column=@Column(name="MASCHE06", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck06", column=@Column(name="RUECK06", precision=9, scale=3) ),
+        @AttributeOverride(name="masche07", column=@Column(name="MASCHE07", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck07", column=@Column(name="RUECK07", precision=9, scale=3) ),
+        @AttributeOverride(name="masche08", column=@Column(name="MASCHE08", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck08", column=@Column(name="RUECK08", precision=9, scale=3) ),
+        @AttributeOverride(name="masche09", column=@Column(name="MASCHE09", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck09", column=@Column(name="RUECK09", precision=9, scale=3) ),
+        @AttributeOverride(name="masche10", column=@Column(name="MASCHE10", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck10", column=@Column(name="RUECK10", precision=9, scale=3) ),
+        @AttributeOverride(name="masche11", column=@Column(name="MASCHE11", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck11", column=@Column(name="RUECK11", precision=9, scale=3) ),
+        @AttributeOverride(name="masche12", column=@Column(name="MASCHE12", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck12", column=@Column(name="RUECK12", precision=9, scale=3) ),
+        @AttributeOverride(name="masche13", column=@Column(name="MASCHE13", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck13", column=@Column(name="RUECK13", precision=9, scale=3) ),
+        @AttributeOverride(name="masche14", column=@Column(name="MASCHE14", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck14", column=@Column(name="RUECK14", precision=9, scale=3) ),
+        @AttributeOverride(name="masche15", column=@Column(name="MASCHE15", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck15", column=@Column(name="RUECK15", precision=9, scale=3) ),
+        @AttributeOverride(name="masche16", column=@Column(name="MASCHE16", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck16", column=@Column(name="RUECK16", precision=9, scale=3) ),
+        @AttributeOverride(name="masche17", column=@Column(name="MASCHE17", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck17", column=@Column(name="RUECK17", precision=9, scale=3) ),
+        @AttributeOverride(name="masche18", column=@Column(name="MASCHE18", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck18", column=@Column(name="RUECK18", precision=9, scale=3) ),
+        @AttributeOverride(name="masche19", column=@Column(name="MASCHE19", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck19", column=@Column(name="RUECK19", precision=9, scale=3) ),
+        @AttributeOverride(name="masche20", column=@Column(name="MASCHE20", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck20", column=@Column(name="RUECK20", precision=9, scale=3) ),
+        @AttributeOverride(name="masche21", column=@Column(name="MASCHE21", precision=7, scale=4) ),
+        @AttributeOverride(name="rueck21", column=@Column(name="RUECK21", precision=9, scale=3) ),
         @AttributeOverride(name="rest", column=@Column(name="REST", precision=9, scale=3) ) } )
     public SsiebungsiebId getId() {
         return this.id;
     }
-    
+
     public void setId(SsiebungsiebId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/SsiebungsiebId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/SsiebungsiebId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -115,14 +115,14 @@
        this.rueck21 = rueck21;
        this.rest = rest;
     }
-   
+
 
 
     @Column(name="SIEBANALYSEID", nullable=false, precision=11, scale=0)
     public long getSiebanalyseid() {
         return this.siebanalyseid;
     }
-    
+
     public void setSiebanalyseid(long siebanalyseid) {
         this.siebanalyseid = siebanalyseid;
     }
@@ -132,7 +132,7 @@
     public long getGsiebsatzid() {
         return this.gsiebsatzid;
     }
-    
+
     public void setGsiebsatzid(long gsiebsatzid) {
         this.gsiebsatzid = gsiebsatzid;
     }
@@ -142,7 +142,7 @@
     public BigDecimal getGmasse() {
         return this.gmasse;
     }
-    
+
     public void setGmasse(BigDecimal gmasse) {
         this.gmasse = gmasse;
     }
@@ -152,7 +152,7 @@
     public BigDecimal getMasche01() {
         return this.masche01;
     }
-    
+
     public void setMasche01(BigDecimal masche01) {
         this.masche01 = masche01;
     }
@@ -162,7 +162,7 @@
     public BigDecimal getRueck01() {
         return this.rueck01;
     }
-    
+
     public void setRueck01(BigDecimal rueck01) {
         this.rueck01 = rueck01;
     }
@@ -172,7 +172,7 @@
     public BigDecimal getMasche02() {
         return this.masche02;
     }
-    
+
     public void setMasche02(BigDecimal masche02) {
         this.masche02 = masche02;
     }
@@ -182,7 +182,7 @@
     public BigDecimal getRueck02() {
         return this.rueck02;
     }
-    
+
     public void setRueck02(BigDecimal rueck02) {
         this.rueck02 = rueck02;
     }
@@ -192,7 +192,7 @@
     public BigDecimal getMasche03() {
         return this.masche03;
     }
-    
+
     public void setMasche03(BigDecimal masche03) {
         this.masche03 = masche03;
     }
@@ -202,7 +202,7 @@
     public BigDecimal getRueck03() {
         return this.rueck03;
     }
-    
+
     public void setRueck03(BigDecimal rueck03) {
         this.rueck03 = rueck03;
     }
@@ -212,7 +212,7 @@
     public BigDecimal getMasche04() {
         return this.masche04;
     }
-    
+
     public void setMasche04(BigDecimal masche04) {
         this.masche04 = masche04;
     }
@@ -222,7 +222,7 @@
     public BigDecimal getRueck04() {
         return this.rueck04;
     }
-    
+
     public void setRueck04(BigDecimal rueck04) {
         this.rueck04 = rueck04;
     }
@@ -232,7 +232,7 @@
     public BigDecimal getMasche05() {
         return this.masche05;
     }
-    
+
     public void setMasche05(BigDecimal masche05) {
         this.masche05 = masche05;
     }
@@ -242,7 +242,7 @@
     public BigDecimal getRueck05() {
         return this.rueck05;
     }
-    
+
     public void setRueck05(BigDecimal rueck05) {
         this.rueck05 = rueck05;
     }
@@ -252,7 +252,7 @@
     public BigDecimal getMasche06() {
         return this.masche06;
     }
-    
+
     public void setMasche06(BigDecimal masche06) {
         this.masche06 = masche06;
     }
@@ -262,7 +262,7 @@
     public BigDecimal getRueck06() {
         return this.rueck06;
     }
-    
+
     public void setRueck06(BigDecimal rueck06) {
         this.rueck06 = rueck06;
     }
@@ -272,7 +272,7 @@
     public BigDecimal getMasche07() {
         return this.masche07;
     }
-    
+
     public void setMasche07(BigDecimal masche07) {
         this.masche07 = masche07;
     }
@@ -282,7 +282,7 @@
     public BigDecimal getRueck07() {
         return this.rueck07;
     }
-    
+
     public void setRueck07(BigDecimal rueck07) {
         this.rueck07 = rueck07;
     }
@@ -292,7 +292,7 @@
     public BigDecimal getMasche08() {
         return this.masche08;
     }
-    
+
     public void setMasche08(BigDecimal masche08) {
         this.masche08 = masche08;
     }
@@ -302,7 +302,7 @@
     public BigDecimal getRueck08() {
         return this.rueck08;
     }
-    
+
     public void setRueck08(BigDecimal rueck08) {
         this.rueck08 = rueck08;
     }
@@ -312,7 +312,7 @@
     public BigDecimal getMasche09() {
         return this.masche09;
     }
-    
+
     public void setMasche09(BigDecimal masche09) {
         this.masche09 = masche09;
     }
@@ -322,7 +322,7 @@
     public BigDecimal getRueck09() {
         return this.rueck09;
     }
-    
+
     public void setRueck09(BigDecimal rueck09) {
         this.rueck09 = rueck09;
     }
@@ -332,7 +332,7 @@
     public BigDecimal getMasche10() {
         return this.masche10;
     }
-    
+
     public void setMasche10(BigDecimal masche10) {
         this.masche10 = masche10;
     }
@@ -342,7 +342,7 @@
     public BigDecimal getRueck10() {
         return this.rueck10;
     }
-    
+
     public void setRueck10(BigDecimal rueck10) {
         this.rueck10 = rueck10;
     }
@@ -352,7 +352,7 @@
     public BigDecimal getMasche11() {
         return this.masche11;
     }
-    
+
     public void setMasche11(BigDecimal masche11) {
         this.masche11 = masche11;
     }
@@ -362,7 +362,7 @@
     public BigDecimal getRueck11() {
         return this.rueck11;
     }
-    
+
     public void setRueck11(BigDecimal rueck11) {
         this.rueck11 = rueck11;
     }
@@ -372,7 +372,7 @@
     public BigDecimal getMasche12() {
         return this.masche12;
     }
-    
+
     public void setMasche12(BigDecimal masche12) {
         this.masche12 = masche12;
     }
@@ -382,7 +382,7 @@
     public BigDecimal getRueck12() {
         return this.rueck12;
     }
-    
+
     public void setRueck12(BigDecimal rueck12) {
         this.rueck12 = rueck12;
     }
@@ -392,7 +392,7 @@
     public BigDecimal getMasche13() {
         return this.masche13;
     }
-    
+
     public void setMasche13(BigDecimal masche13) {
         this.masche13 = masche13;
     }
@@ -402,7 +402,7 @@
     public BigDecimal getRueck13() {
         return this.rueck13;
     }
-    
+
     public void setRueck13(BigDecimal rueck13) {
         this.rueck13 = rueck13;
     }
@@ -412,7 +412,7 @@
     public BigDecimal getMasche14() {
         return this.masche14;
     }
-    
+
     public void setMasche14(BigDecimal masche14) {
         this.masche14 = masche14;
     }
@@ -422,7 +422,7 @@
     public BigDecimal getRueck14() {
         return this.rueck14;
     }
-    
+
     public void setRueck14(BigDecimal rueck14) {
         this.rueck14 = rueck14;
     }
@@ -432,7 +432,7 @@
     public BigDecimal getMasche15() {
         return this.masche15;
     }
-    
+
     public void setMasche15(BigDecimal masche15) {
         this.masche15 = masche15;
     }
@@ -442,7 +442,7 @@
     public BigDecimal getRueck15() {
         return this.rueck15;
     }
-    
+
     public void setRueck15(BigDecimal rueck15) {
         this.rueck15 = rueck15;
     }
@@ -452,7 +452,7 @@
     public BigDecimal getMasche16() {
         return this.masche16;
     }
-    
+
     public void setMasche16(BigDecimal masche16) {
         this.masche16 = masche16;
     }
@@ -462,7 +462,7 @@
     public BigDecimal getRueck16() {
         return this.rueck16;
     }
-    
+
     public void setRueck16(BigDecimal rueck16) {
         this.rueck16 = rueck16;
     }
@@ -472,7 +472,7 @@
     public BigDecimal getMasche17() {
         return this.masche17;
     }
-    
+
     public void setMasche17(BigDecimal masche17) {
         this.masche17 = masche17;
     }
@@ -482,7 +482,7 @@
     public BigDecimal getRueck17() {
         return this.rueck17;
     }
-    
+
     public void setRueck17(BigDecimal rueck17) {
         this.rueck17 = rueck17;
     }
@@ -492,7 +492,7 @@
     public BigDecimal getMasche18() {
         return this.masche18;
     }
-    
+
     public void setMasche18(BigDecimal masche18) {
         this.masche18 = masche18;
     }
@@ -502,7 +502,7 @@
     public BigDecimal getRueck18() {
         return this.rueck18;
     }
-    
+
     public void setRueck18(BigDecimal rueck18) {
         this.rueck18 = rueck18;
     }
@@ -512,7 +512,7 @@
     public BigDecimal getMasche19() {
         return this.masche19;
     }
-    
+
     public void setMasche19(BigDecimal masche19) {
         this.masche19 = masche19;
     }
@@ -522,7 +522,7 @@
     public BigDecimal getRueck19() {
         return this.rueck19;
     }
-    
+
     public void setRueck19(BigDecimal rueck19) {
         this.rueck19 = rueck19;
     }
@@ -532,7 +532,7 @@
     public BigDecimal getMasche20() {
         return this.masche20;
     }
-    
+
     public void setMasche20(BigDecimal masche20) {
         this.masche20 = masche20;
     }
@@ -542,7 +542,7 @@
     public BigDecimal getRueck20() {
         return this.rueck20;
     }
-    
+
     public void setRueck20(BigDecimal rueck20) {
         this.rueck20 = rueck20;
     }
@@ -552,7 +552,7 @@
     public BigDecimal getMasche21() {
         return this.masche21;
     }
-    
+
     public void setMasche21(BigDecimal masche21) {
         this.masche21 = masche21;
     }
@@ -562,7 +562,7 @@
     public BigDecimal getRueck21() {
         return this.rueck21;
     }
-    
+
     public void setRueck21(BigDecimal rueck21) {
         this.rueck21 = rueck21;
     }
@@ -572,7 +572,7 @@
     public BigDecimal getRest() {
         return this.rest;
     }
-    
+
     public void setRest(BigDecimal rest) {
         this.rest = rest;
     }
@@ -582,8 +582,8 @@
          if ( (this == other ) ) return true;
 		 if ( (other == null ) ) return false;
 		 if ( !(other instanceof SsiebungsiebId) ) return false;
-		 SsiebungsiebId castOther = ( SsiebungsiebId ) other; 
-         
+		 SsiebungsiebId castOther = ( SsiebungsiebId ) other;
+
 		 return (this.getSiebanalyseid()==castOther.getSiebanalyseid())
  && (this.getGsiebsatzid()==castOther.getGsiebsatzid())
  && ( (this.getGmasse()==castOther.getGmasse()) || ( this.getGmasse()!=null && castOther.getGmasse()!=null && this.getGmasse().equals(castOther.getGmasse()) ) )
@@ -631,10 +631,10 @@
  && ( (this.getRueck21()==castOther.getRueck21()) || ( this.getRueck21()!=null && castOther.getRueck21()!=null && this.getRueck21().equals(castOther.getRueck21()) ) )
  && ( (this.getRest()==castOther.getRest()) || ( this.getRest()!=null && castOther.getRest()!=null && this.getRest().equals(castOther.getRest()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getSiebanalyseid();
          result = 37 * result + (int) this.getGsiebsatzid();
          result = 37 * result + ( getGmasse() == null ? 0 : this.getGmasse().hashCode() );
@@ -682,5 +682,5 @@
          result = 37 * result + ( getRueck21() == null ? 0 : this.getRueck21().hashCode() );
          result = 37 * result + ( getRest() == null ? 0 : this.getRest().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Station.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Station.java	Fri Jun 15 09:20:49 2012 +0000
@@ -21,7 +21,7 @@
 @Entity
 @Table(name="STATION"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames={"GEWAESSERID", "NAME"}) 
+    , uniqueConstraints = @UniqueConstraint(columnNames={"GEWAESSERID", "NAME"})
 )
 public class Station  implements java.io.Serializable {
 
@@ -84,15 +84,15 @@
        this.mpeilungs = mpeilungs;
        this.messungs = messungs;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="STATIONID", unique=true, nullable=false, precision=11, scale=0)
     public long getStationid() {
         return this.stationid;
     }
-    
+
     public void setStationid(long stationid) {
         this.stationid = stationid;
     }
@@ -102,7 +102,7 @@
     public Bezugspegel getBezugspegel() {
         return this.bezugspegel;
     }
-    
+
     public void setBezugspegel(Bezugspegel bezugspegel) {
         this.bezugspegel = bezugspegel;
     }
@@ -112,157 +112,157 @@
     public Gewaesser getGewaesser() {
         return this.gewaesser;
     }
-    
+
     public void setGewaesser(Gewaesser gewaesser) {
         this.gewaesser = gewaesser;
     }
 
-    
+
     @Column(name="KM", nullable=false, precision=8, scale=3)
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
 
-    
+
     @Column(name="NAME", nullable=false, length=50)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="UFERISTLINKS", nullable=false, precision=1, scale=0)
     public boolean isUferistlinks() {
         return this.uferistlinks;
     }
-    
+
     public void setUferistlinks(boolean uferistlinks) {
         this.uferistlinks = uferistlinks;
     }
 
-    
+
     @Column(name="TEIL_VON", precision=8, scale=3)
     public BigDecimal getTeilVon() {
         return this.teilVon;
     }
-    
+
     public void setTeilVon(BigDecimal teilVon) {
         this.teilVon = teilVon;
     }
 
-    
+
     @Column(name="TEIL_BIS", precision=8, scale=3)
     public BigDecimal getTeilBis() {
         return this.teilBis;
     }
-    
+
     public void setTeilBis(BigDecimal teilBis) {
         this.teilBis = teilBis;
     }
 
-    
+
     @Column(name="ABST_HMST", precision=8, scale=3)
     public BigDecimal getAbstHmst() {
         return this.abstHmst;
     }
-    
+
     public void setAbstHmst(BigDecimal abstHmst) {
         this.abstHmst = abstHmst;
     }
 
-    
+
     @Column(name="L_HOCHWERT", precision=11, scale=3)
     public BigDecimal getLHochwert() {
         return this.LHochwert;
     }
-    
+
     public void setLHochwert(BigDecimal LHochwert) {
         this.LHochwert = LHochwert;
     }
 
-    
+
     @Column(name="L_RECHWERT", precision=11, scale=3)
     public BigDecimal getLRechwert() {
         return this.LRechwert;
     }
-    
+
     public void setLRechwert(BigDecimal LRechwert) {
         this.LRechwert = LRechwert;
     }
 
-    
+
     @Column(name="L_NN", precision=8, scale=3)
     public BigDecimal getLNn() {
         return this.LNn;
     }
-    
+
     public void setLNn(BigDecimal LNn) {
         this.LNn = LNn;
     }
 
-    
+
     @Column(name="R_HOCHWERT", precision=11, scale=3)
     public BigDecimal getRHochwert() {
         return this.RHochwert;
     }
-    
+
     public void setRHochwert(BigDecimal RHochwert) {
         this.RHochwert = RHochwert;
     }
 
-    
+
     @Column(name="R_RECHWERT", precision=11, scale=3)
     public BigDecimal getRRechwert() {
         return this.RRechwert;
     }
-    
+
     public void setRRechwert(BigDecimal RRechwert) {
         this.RRechwert = RRechwert;
     }
 
-    
+
     @Column(name="R_NN", precision=8, scale=3)
     public BigDecimal getRNn() {
         return this.RNn;
     }
-    
+
     public void setRNn(BigDecimal RNn) {
         this.RNn = RNn;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
 
-    
+
     @Column(name="OLDMSTID", precision=11, scale=0)
     public Long getOldmstid() {
         return this.oldmstid;
     }
-    
+
     public void setOldmstid(Long oldmstid) {
         this.oldmstid = oldmstid;
     }
 
-    
+
     @Column(name="ISTFESTSTOFF", nullable=false, precision=1, scale=0)
     public boolean isIstfeststoff() {
         return this.istfeststoff;
     }
-    
+
     public void setIstfeststoff(boolean istfeststoff) {
         this.istfeststoff = istfeststoff;
     }
@@ -271,7 +271,7 @@
     public Set<Sohltest> getSohltests() {
         return this.sohltests;
     }
-    
+
     public void setSohltests(Set<Sohltest> sohltests) {
         this.sohltests = sohltests;
     }
@@ -280,7 +280,7 @@
     public Set<Hpeilung> getHpeilungs() {
         return this.hpeilungs;
     }
-    
+
     public void setHpeilungs(Set<Hpeilung> hpeilungs) {
         this.hpeilungs = hpeilungs;
     }
@@ -289,7 +289,7 @@
     public Set<Mpeilung> getMpeilungs() {
         return this.mpeilungs;
     }
-    
+
     public void setMpeilungs(Set<Mpeilung> mpeilungs) {
         this.mpeilungs = mpeilungs;
     }
@@ -298,7 +298,7 @@
     public Set<Messung> getMessungs() {
         return this.messungs;
     }
-    
+
     public void setMessungs(Set<Messung> messungs) {
         this.messungs = messungs;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Stationgew.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Stationgew.java	Fri Jun 15 09:20:49 2012 +0000
@@ -27,34 +27,34 @@
     public Stationgew(StationgewId id) {
        this.id = id;
     }
-   
+
      @EmbeddedId
 
-    
+
     @AttributeOverrides( {
-        @AttributeOverride(name="stationid", column=@Column(name="STATIONID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="gewaesserid", column=@Column(name="GEWAESSERID", nullable=false, precision=11, scale=0) ), 
-        @AttributeOverride(name="km", column=@Column(name="KM", nullable=false, precision=8, scale=3) ), 
-        @AttributeOverride(name="bezugspegelid", column=@Column(name="BEZUGSPEGELID", precision=11, scale=0) ), 
-        @AttributeOverride(name="name", column=@Column(name="NAME", nullable=false, length=50) ), 
-        @AttributeOverride(name="uferistlinks", column=@Column(name="UFERISTLINKS", nullable=false, precision=1, scale=0) ), 
-        @AttributeOverride(name="teilVon", column=@Column(name="TEIL_VON", precision=8, scale=3) ), 
-        @AttributeOverride(name="teilBis", column=@Column(name="TEIL_BIS", precision=8, scale=3) ), 
-        @AttributeOverride(name="abstHmst", column=@Column(name="ABST_HMST", precision=8, scale=3) ), 
-        @AttributeOverride(name="LHochwert", column=@Column(name="L_HOCHWERT", precision=11, scale=3) ), 
-        @AttributeOverride(name="LRechwert", column=@Column(name="L_RECHWERT", precision=11, scale=3) ), 
-        @AttributeOverride(name="LNn", column=@Column(name="L_NN", precision=8, scale=3) ), 
-        @AttributeOverride(name="RHochwert", column=@Column(name="R_HOCHWERT", precision=11, scale=3) ), 
-        @AttributeOverride(name="RRechwert", column=@Column(name="R_RECHWERT", precision=11, scale=3) ), 
-        @AttributeOverride(name="RNn", column=@Column(name="R_NN", precision=8, scale=3) ), 
-        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ), 
-        @AttributeOverride(name="oldmstid", column=@Column(name="OLDMSTID", precision=11, scale=0) ), 
-        @AttributeOverride(name="istfeststoff", column=@Column(name="ISTFESTSTOFF", nullable=false, precision=1, scale=0) ), 
+        @AttributeOverride(name="stationid", column=@Column(name="STATIONID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="gewaesserid", column=@Column(name="GEWAESSERID", nullable=false, precision=11, scale=0) ),
+        @AttributeOverride(name="km", column=@Column(name="KM", nullable=false, precision=8, scale=3) ),
+        @AttributeOverride(name="bezugspegelid", column=@Column(name="BEZUGSPEGELID", precision=11, scale=0) ),
+        @AttributeOverride(name="name", column=@Column(name="NAME", nullable=false, length=50) ),
+        @AttributeOverride(name="uferistlinks", column=@Column(name="UFERISTLINKS", nullable=false, precision=1, scale=0) ),
+        @AttributeOverride(name="teilVon", column=@Column(name="TEIL_VON", precision=8, scale=3) ),
+        @AttributeOverride(name="teilBis", column=@Column(name="TEIL_BIS", precision=8, scale=3) ),
+        @AttributeOverride(name="abstHmst", column=@Column(name="ABST_HMST", precision=8, scale=3) ),
+        @AttributeOverride(name="LHochwert", column=@Column(name="L_HOCHWERT", precision=11, scale=3) ),
+        @AttributeOverride(name="LRechwert", column=@Column(name="L_RECHWERT", precision=11, scale=3) ),
+        @AttributeOverride(name="LNn", column=@Column(name="L_NN", precision=8, scale=3) ),
+        @AttributeOverride(name="RHochwert", column=@Column(name="R_HOCHWERT", precision=11, scale=3) ),
+        @AttributeOverride(name="RRechwert", column=@Column(name="R_RECHWERT", precision=11, scale=3) ),
+        @AttributeOverride(name="RNn", column=@Column(name="R_NN", precision=8, scale=3) ),
+        @AttributeOverride(name="bemerkung", column=@Column(name="BEMERKUNG", length=240) ),
+        @AttributeOverride(name="oldmstid", column=@Column(name="OLDMSTID", precision=11, scale=0) ),
+        @AttributeOverride(name="istfeststoff", column=@Column(name="ISTFESTSTOFF", nullable=false, precision=1, scale=0) ),
         @AttributeOverride(name="gewname", column=@Column(name="GEWNAME", nullable=false, length=20) ) } )
     public StationgewId getId() {
         return this.id;
     }
-    
+
     public void setId(StationgewId id) {
         this.id = id;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/StationgewId.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/StationgewId.java	Fri Jun 15 09:20:49 2012 +0000
@@ -66,14 +66,14 @@
        this.istfeststoff = istfeststoff;
        this.gewname = gewname;
     }
-   
+
 
 
     @Column(name="STATIONID", nullable=false, precision=11, scale=0)
     public long getStationid() {
         return this.stationid;
     }
-    
+
     public void setStationid(long stationid) {
         this.stationid = stationid;
     }
@@ -83,7 +83,7 @@
     public long getGewaesserid() {
         return this.gewaesserid;
     }
-    
+
     public void setGewaesserid(long gewaesserid) {
         this.gewaesserid = gewaesserid;
     }
@@ -93,7 +93,7 @@
     public BigDecimal getKm() {
         return this.km;
     }
-    
+
     public void setKm(BigDecimal km) {
         this.km = km;
     }
@@ -103,7 +103,7 @@
     public Long getBezugspegelid() {
         return this.bezugspegelid;
     }
-    
+
     public void setBezugspegelid(Long bezugspegelid) {
         this.bezugspegelid = bezugspegelid;
     }
@@ -113,7 +113,7 @@
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
@@ -123,7 +123,7 @@
     public boolean isUferistlinks() {
         return this.uferistlinks;
     }
-    
+
     public void setUferistlinks(boolean uferistlinks) {
         this.uferistlinks = uferistlinks;
     }
@@ -133,7 +133,7 @@
     public BigDecimal getTeilVon() {
         return this.teilVon;
     }
-    
+
     public void setTeilVon(BigDecimal teilVon) {
         this.teilVon = teilVon;
     }
@@ -143,7 +143,7 @@
     public BigDecimal getTeilBis() {
         return this.teilBis;
     }
-    
+
     public void setTeilBis(BigDecimal teilBis) {
         this.teilBis = teilBis;
     }
@@ -153,7 +153,7 @@
     public BigDecimal getAbstHmst() {
         return this.abstHmst;
     }
-    
+
     public void setAbstHmst(BigDecimal abstHmst) {
         this.abstHmst = abstHmst;
     }
@@ -163,7 +163,7 @@
     public BigDecimal getLHochwert() {
         return this.LHochwert;
     }
-    
+
     public void setLHochwert(BigDecimal LHochwert) {
         this.LHochwert = LHochwert;
     }
@@ -173,7 +173,7 @@
     public BigDecimal getLRechwert() {
         return this.LRechwert;
     }
-    
+
     public void setLRechwert(BigDecimal LRechwert) {
         this.LRechwert = LRechwert;
     }
@@ -183,7 +183,7 @@
     public BigDecimal getLNn() {
         return this.LNn;
     }
-    
+
     public void setLNn(BigDecimal LNn) {
         this.LNn = LNn;
     }
@@ -193,7 +193,7 @@
     public BigDecimal getRHochwert() {
         return this.RHochwert;
     }
-    
+
     public void setRHochwert(BigDecimal RHochwert) {
         this.RHochwert = RHochwert;
     }
@@ -203,7 +203,7 @@
     public BigDecimal getRRechwert() {
         return this.RRechwert;
     }
-    
+
     public void setRRechwert(BigDecimal RRechwert) {
         this.RRechwert = RRechwert;
     }
@@ -213,7 +213,7 @@
     public BigDecimal getRNn() {
         return this.RNn;
     }
-    
+
     public void setRNn(BigDecimal RNn) {
         this.RNn = RNn;
     }
@@ -223,7 +223,7 @@
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -233,7 +233,7 @@
     public Long getOldmstid() {
         return this.oldmstid;
     }
-    
+
     public void setOldmstid(Long oldmstid) {
         this.oldmstid = oldmstid;
     }
@@ -243,7 +243,7 @@
     public boolean isIstfeststoff() {
         return this.istfeststoff;
     }
-    
+
     public void setIstfeststoff(boolean istfeststoff) {
         this.istfeststoff = istfeststoff;
     }
@@ -253,7 +253,7 @@
     public String getGewname() {
         return this.gewname;
     }
-    
+
     public void setGewname(String gewname) {
         this.gewname = gewname;
     }
@@ -263,8 +263,8 @@
          if ( (this == other ) ) return true;
          if ( (other == null ) ) return false;
          if ( !(other instanceof StationgewId) ) return false;
-         StationgewId castOther = ( StationgewId ) other; 
-         
+         StationgewId castOther = ( StationgewId ) other;
+
          return (this.getStationid()==castOther.getStationid())
  && (this.getGewaesserid()==castOther.getGewaesserid())
  && ( (this.getKm()==castOther.getKm()) || ( this.getKm()!=null && castOther.getKm()!=null && this.getKm().equals(castOther.getKm()) ) )
@@ -285,10 +285,10 @@
  && (this.isIstfeststoff()==castOther.isIstfeststoff())
  && ( (this.getGewname()==castOther.getGewname()) || ( this.getGewname()!=null && castOther.getGewname()!=null && this.getGewname().equals(castOther.getGewname()) ) );
    }
-   
+
    public int hashCode() {
          int result = 17;
-         
+
          result = 37 * result + (int) this.getStationid();
          result = 37 * result + (int) this.getGewaesserid();
          result = 37 * result + ( getKm() == null ? 0 : this.getKm().hashCode() );
@@ -309,5 +309,5 @@
          result = 37 * result + (this.isIstfeststoff()?1:0);
          result = 37 * result + ( getGewname() == null ? 0 : this.getGewname().hashCode() );
          return result;
-   }   
+   }
 }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpGloChanged.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpGloChanged.java	Fri Jun 15 09:20:49 2012 +0000
@@ -14,7 +14,7 @@
 @Entity
 @Table(name="TMP_GLO_CHANGED"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="GLOTRECHTEID") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="GLOTRECHTEID")
 )
 public class TmpGloChanged  implements java.io.Serializable {
 
@@ -27,15 +27,15 @@
     public TmpGloChanged(long glotrechteid) {
        this.glotrechteid = glotrechteid;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="GLOTRECHTEID", unique=true, nullable=false, precision=11, scale=0)
     public long getGlotrechteid() {
         return this.glotrechteid;
     }
-    
+
     public void setGlotrechteid(long glotrechteid) {
         this.glotrechteid = glotrechteid;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesAchanged.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesAchanged.java	Fri Jun 15 09:20:49 2012 +0000
@@ -14,7 +14,7 @@
 @Entity
 @Table(name="TMP_MES_ACHANGED"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID")
 )
 public class TmpMesAchanged  implements java.io.Serializable {
 
@@ -27,15 +27,15 @@
     public TmpMesAchanged(long messungid) {
        this.messungid = messungid;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="MESSUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesGchanged.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesGchanged.java	Fri Jun 15 09:20:49 2012 +0000
@@ -14,7 +14,7 @@
 @Entity
 @Table(name="TMP_MES_GCHANGED"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID")
 )
 public class TmpMesGchanged  implements java.io.Serializable {
 
@@ -27,15 +27,15 @@
     public TmpMesGchanged(long messungid) {
        this.messungid = messungid;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="MESSUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesQchanged.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesQchanged.java	Fri Jun 15 09:20:49 2012 +0000
@@ -14,7 +14,7 @@
 @Entity
 @Table(name="TMP_MES_QCHANGED"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID")
 )
 public class TmpMesQchanged  implements java.io.Serializable {
 
@@ -27,15 +27,15 @@
     public TmpMesQchanged(long messungid) {
        this.messungid = messungid;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="MESSUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesSchanged.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/TmpMesSchanged.java	Fri Jun 15 09:20:49 2012 +0000
@@ -14,7 +14,7 @@
 @Entity
 @Table(name="TMP_MES_SCHANGED"
     ,schema="SEDDB"
-    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID") 
+    , uniqueConstraints = @UniqueConstraint(columnNames="MESSUNGID")
 )
 public class TmpMesSchanged  implements java.io.Serializable {
 
@@ -27,15 +27,15 @@
     public TmpMesSchanged(long messungid) {
        this.messungid = messungid;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="MESSUNGID", unique=true, nullable=false, precision=11, scale=0)
     public long getMessungid() {
         return this.messungid;
     }
-    
+
     public void setMessungid(long messungid) {
         this.messungid = messungid;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzarchiv.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzarchiv.java	Fri Jun 15 09:20:49 2012 +0000
@@ -42,45 +42,45 @@
        this.bemerkung = bemerkung;
        this.sohltests = sohltests;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="ARCHIVID", unique=true, nullable=false, precision=11, scale=0)
     public long getArchivid() {
         return this.archivid;
     }
-    
+
     public void setArchivid(long archivid) {
         this.archivid = archivid;
     }
 
-    
+
     @Column(name="NAME", nullable=false, length=50)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="ISTAKTIV", nullable=false, precision=1, scale=0)
     public boolean isIstaktiv() {
         return this.istaktiv;
     }
-    
+
     public void setIstaktiv(boolean istaktiv) {
         this.istaktiv = istaktiv;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -89,7 +89,7 @@
     public Set<Sohltest> getSohltests() {
         return this.sohltests;
     }
-    
+
     public void setSohltests(Set<Sohltest> sohltests) {
         this.sohltests = sohltests;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzprobenahmeart.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzprobenahmeart.java	Fri Jun 15 09:20:49 2012 +0000
@@ -31,7 +31,7 @@
     public Zzprobenahmeart() {
     }
 
-	
+
     public Zzprobenahmeart(long probenahmeartid, boolean istkern, String name, boolean istaktiv) {
         this.probenahmeartid = probenahmeartid;
         this.istkern = istkern;
@@ -46,55 +46,55 @@
        this.bemerkung = bemerkung;
        this.sohlprobes = sohlprobes;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="PROBENAHMEARTID", unique=true, nullable=false, precision=11, scale=0)
     public long getProbenahmeartid() {
         return this.probenahmeartid;
     }
-    
+
     public void setProbenahmeartid(long probenahmeartid) {
         this.probenahmeartid = probenahmeartid;
     }
 
-    
+
     @Column(name="ISTKERN", nullable=false, precision=1, scale=0)
     public boolean isIstkern() {
         return this.istkern;
     }
-    
+
     public void setIstkern(boolean istkern) {
         this.istkern = istkern;
     }
 
-    
+
     @Column(name="NAME", nullable=false, length=50)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="ISTAKTIV", nullable=false, precision=1, scale=0)
     public boolean isIstaktiv() {
         return this.istaktiv;
     }
-    
+
     public void setIstaktiv(boolean istaktiv) {
         this.istaktiv = istaktiv;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -103,7 +103,7 @@
     public Set<Sohlprobe> getSohlprobes() {
         return this.sohlprobes;
     }
-    
+
     public void setSohlprobes(Set<Sohlprobe> sohlprobes) {
         this.sohlprobes = sohlprobes;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzsondierungart.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzsondierungart.java	Fri Jun 15 09:20:49 2012 +0000
@@ -42,45 +42,45 @@
        this.bemerkung = bemerkung;
        this.sohltests = sohltests;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="SONDIERUNGARTID", unique=true, nullable=false, precision=11, scale=0)
     public long getSondierungartid() {
         return this.sondierungartid;
     }
-    
+
     public void setSondierungartid(long sondierungartid) {
         this.sondierungartid = sondierungartid;
     }
 
-    
+
     @Column(name="NAME", nullable=false, length=50)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="ISTAKTIV", nullable=false, precision=1, scale=0)
     public boolean isIstaktiv() {
         return this.istaktiv;
     }
-    
+
     public void setIstaktiv(boolean istaktiv) {
         this.istaktiv = istaktiv;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -89,7 +89,7 @@
     public Set<Sohltest> getSohltests() {
         return this.sohltests;
     }
-    
+
     public void setSohltests(Set<Sohltest> sohltests) {
         this.sohltests = sohltests;
     }
--- a/flys-backend/src/main/java/de/intevation/seddb/model/Zzthema.java	Thu Jun 14 15:39:42 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/seddb/model/Zzthema.java	Fri Jun 15 09:20:49 2012 +0000
@@ -31,7 +31,7 @@
     public Zzthema() {
     }
 
-	
+
     public Zzthema(long themaid, String name, boolean istaktiv) {
         this.themaid = themaid;
         this.name = name;
@@ -45,45 +45,45 @@
        this.bilds = bilds;
        this.probebilds = probebilds;
     }
-   
-     @Id 
 
-    
+     @Id
+
+
     @Column(name="THEMAID", unique=true, nullable=false, precision=11, scale=0)
     public long getThemaid() {
         return this.themaid;
     }
-    
+
     public void setThemaid(long themaid) {
         this.themaid = themaid;
     }
 
-    
+
     @Column(name="NAME", nullable=false, length=50)
     public String getName() {
         return this.name;
     }
-    
+
     public void setName(String name) {
         this.name = name;
     }
 
-    
+
     @Column(name="ISTAKTIV", nullable=false, precision=1, scale=0)
     public boolean isIstaktiv() {
         return this.istaktiv;
     }
-    
+
     public void setIstaktiv(boolean istaktiv) {
         this.istaktiv = istaktiv;
     }
 
-    
+
     @Column(name="BEMERKUNG", length=240)
     public String getBemerkung() {
         return this.bemerkung;
     }
-    
+
     public void setBemerkung(String bemerkung) {
         this.bemerkung = bemerkung;
     }
@@ -92,7 +92,7 @@
     public Set<Bild> getBilds() {
         return this.bilds;
     }
-    
+
     public void setBilds(Set<Bild> bilds) {
         this.bilds = bilds;
     }
@@ -101,7 +101,7 @@
     public Set<Probebild> getProbebilds() {
         return this.probebilds;
     }
-    
+
     public void setProbebilds(Set<Probebild> probebilds) {
         this.probebilds = probebilds;
     }

http://dive4elements.wald.intevation.org