diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/QWDDateRange.java @ 9617:1d4262a68f1f

#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
author dnt_bjoernsen <d.tironi@bjoernsen.de>
date Thu, 10 Oct 2019 15:29:02 +0200
parents af13ceeba52a
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QWDDateRange.java	Wed Oct 09 19:25:55 2019 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/QWDDateRange.java	Thu Oct 10 15:29:02 2019 +0200
@@ -8,25 +8,22 @@
 
 package org.dive4elements.river.artifacts.model;
 
-
 import java.io.Serializable;
 
 import org.dive4elements.river.artifacts.model.fixings.QWD;
 
-public class QWDDateRange
-implements   Serializable
-{
+public class QWDDateRange implements Serializable {
 
-    public QWD qwd;
     public DateRange dateRange;
+    public QWD qwd;
 
-    public QWDDateRange(QWD qwd, DateRange dr) {
+    public QWDDateRange(final QWD qwd, final DateRange dr) {
         this.qwd = qwd;
         this.dateRange = dr;
     }
 
     public QWD getQWD() {
-        return qwd;
+        return this.qwd;
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org