Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/AreaFacet.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
| author | gernotbelger |
|---|---|
| date | Fri, 19 Jan 2018 11:23:42 +0100 |
| parents | 5e38e2924c07 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 118 protected Object upperData; | 118 protected Object upperData; |
| 119 protected Object lowerData; | 119 protected Object lowerData; |
| 120 protected boolean doPaintBetween; | 120 protected boolean doPaintBetween; |
| 121 | 121 |
| 122 /** Create a new result data bundle. */ | 122 /** Create a new result data bundle. */ |
| 123 public Data(String upperFacetName, String lowerFacetName, Object low, Object up, boolean between) { | 123 public Data( |
| 124 String upperFacetName, | |
| 125 String lowerFacetName, | |
| 126 Object low, | |
| 127 Object up, | |
| 128 boolean between | |
| 129 ) { | |
| 124 this.lowerData = low; | 130 this.lowerData = low; |
| 125 this.upperData = up; | 131 this.upperData = up; |
| 126 this.doPaintBetween = between; | 132 this.doPaintBetween = between; |
| 127 this.lowerFacetName = lowerFacetName; | 133 this.lowerFacetName = lowerFacetName; |
| 128 this.upperFacetName = upperFacetName; | 134 this.upperFacetName = upperFacetName; |