Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightData.java @ 7694:622c89640048
Add Override marker and fix indention
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 16 Dec 2013 12:41:16 +0100 |
| parents | 4508501cdde7 |
| children |
comparison
equal
deleted
inserted
replaced
| 7693:c130196389df | 7694:622c89640048 |
|---|---|
| 189 new Object[] { getStartYear(), getEndYear() } | 189 new Object[] { getStartYear(), getEndYear() } |
| 190 ); | 190 ); |
| 191 } | 191 } |
| 192 } | 192 } |
| 193 | 193 |
| 194 public int compareTo(MiddleBedHeightData other) { | 194 @Override |
| 195 | 195 public int compareTo(MiddleBedHeightData other) { |
| 196 int descCompared = description.compareTo(other.getDescription()); | 196 |
| 197 | 197 int descCompared = description.compareTo(other.getDescription()); |
| 198 if (descCompared != 0) { | 198 |
| 199 return descCompared; | 199 if (descCompared != 0) { |
| 200 } | 200 return descCompared; |
| 201 | 201 } |
| 202 if (size() == 0 || other.size() == 0) { | 202 |
| 203 if (size() == 0 && other.size() > 0) { | 203 if (size() == 0 || other.size() == 0) { |
| 204 return 1; | 204 if (size() == 0 && other.size() > 0) { |
| 205 } else if (size() > 0 && other.size() == 0) { | 205 return 1; |
| 206 return -1; | 206 } else if (size() > 0 && other.size() == 0) { |
| 207 } else if (size() == 0 && other.size() == 0) { | 207 return -1; |
| 208 return 0; | 208 } else if (size() == 0 && other.size() == 0) { |
| 209 } | 209 return 0; |
| 210 } | 210 } |
| 211 | 211 } |
| 212 if (getKM(0) < other.getKM(0)) { | 212 |
| 213 return -1; | 213 if (getKM(0) < other.getKM(0)) { |
| 214 } else if (getKM(0) > other.getKM(0)) { | 214 return -1; |
| 215 return 1; | 215 } else if (getKM(0) > other.getKM(0)) { |
| 216 } | 216 return 1; |
| 217 return 0; | 217 } |
| 218 } | 218 return 0; |
| 219 } | |
| 219 } | 220 } |
| 220 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 221 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |