# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1364396370 -3600
# Node ID d7bb32f9522006ef372e36c6ecdce1f769474fe3
# Parent  de3c77d35fefa49e2209c977cf22c1000108b99a# Parent  5b75dfc1b6379ba2a77bd704aa1245b6ab560aa7
merged.

diff -r 5b75dfc1b637 -r d7bb32f95220 flys-backend/src/main/java/de/intevation/flys/importer/ImportMeasurementStation.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportMeasurementStation.java	Wed Mar 27 15:39:37 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportMeasurementStation.java	Wed Mar 27 15:59:30 2013 +0100
@@ -27,7 +27,7 @@
     public String gauge;
     public ImportTimeInterval observationTimerange;
     public String operator;
-    public String comment;
+    public String description;
 
     public ImportMeasurementStation() {
     }
@@ -97,7 +97,7 @@
 
                 peer = new MeasurementStation(river, name, measurementType,
                     riverside, station, range, gauge, this.gauge,
-                    observationTimerange, operator, comment);
+                    observationTimerange, operator, description);
 
                 session.save(peer);
             }
diff -r 5b75dfc1b637 -r d7bb32f95220 flys-backend/src/main/java/de/intevation/flys/importer/parsers/MeasurementStationsParser.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/MeasurementStationsParser.java	Wed Mar 27 15:39:37 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/MeasurementStationsParser.java	Wed Mar 27 15:59:30 2013 +0100
@@ -80,7 +80,7 @@
         current.gauge = getGauge(cols);
         current.observationTimerange = getObservationTimerange(cols);
         current.operator = getOperator(cols);
-        current.comment = getComment(cols);
+        current.description = getDescription(cols);
 
         log.debug("Found new measurement station '" + current.name + "' at km "
             + current.station);
@@ -181,7 +181,7 @@
         return cols[9];
     }
 
-    protected String getComment(String[] cols) {
+    protected String getDescription(String[] cols) {
         return cols.length > 10 ? cols[10] : null;
     }
 }
diff -r 5b75dfc1b637 -r d7bb32f95220 flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java	Wed Mar 27 15:39:37 2013 +0100
+++ b/flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java	Wed Mar 27 15:59:30 2013 +0100
@@ -21,7 +21,7 @@
     private String measurementType;
     private String riverside;
     private String operator;
-    private String comment;
+    private String description;
 
     private Double station;
     private Range range;
@@ -39,7 +39,7 @@
     public MeasurementStation(River river, String name, String measurementType,
         String riverside, Double station, Range range, Gauge gauge,
         String gaugeName, TimeInterval observationTimerange, String operator,
-        String comment
+        String description
     ) {
         this.river = river;
         this.name = name;
@@ -51,7 +51,7 @@
         this.gaugeName = gaugeName;
         this.observationTimerange = observationTimerange;
         this.operator = operator;
-        this.comment = comment;
+        this.description = description;
     }
 
     @Id
@@ -160,12 +160,12 @@
         this.operator = operator;
     }
 
-    @Column(name = "comment")
-    public String getComment() {
-        return comment;
+    @Column(name = "description")
+    public String getDescription() {
+        return description;
     }
 
-    public void setComment(String comment) {
-        this.comment = comment;
+    public void setDescription(String description) {
+        this.description = description;
     }
 }