Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 9616:cedcee24a21a | 9617:1d4262a68f1f |
|---|---|
| 6 * documentation coming with Dive4Elements River for details. | 6 * documentation coming with Dive4Elements River for details. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 package org.dive4elements.river.artifacts.model; | 9 package org.dive4elements.river.artifacts.model; |
| 10 | 10 |
| 11 | |
| 12 import java.io.Serializable; | 11 import java.io.Serializable; |
| 13 | 12 |
| 14 import org.dive4elements.river.artifacts.model.fixings.QWD; | 13 import org.dive4elements.river.artifacts.model.fixings.QWD; |
| 15 | 14 |
| 16 public class QWDDateRange | 15 public class QWDDateRange implements Serializable { |
| 17 implements Serializable | |
| 18 { | |
| 19 | 16 |
| 17 public DateRange dateRange; | |
| 20 public QWD qwd; | 18 public QWD qwd; |
| 21 public DateRange dateRange; | |
| 22 | 19 |
| 23 public QWDDateRange(QWD qwd, DateRange dr) { | 20 public QWDDateRange(final QWD qwd, final DateRange dr) { |
| 24 this.qwd = qwd; | 21 this.qwd = qwd; |
| 25 this.dateRange = dr; | 22 this.dateRange = dr; |
| 26 } | 23 } |
| 27 | 24 |
| 28 public QWD getQWD() { | 25 public QWD getQWD() { |
| 29 return qwd; | 26 return this.qwd; |
| 30 } | 27 } |
| 31 } | 28 } |
| 32 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 29 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |