Mercurial > dive4elements > river
changeset 7694:622c89640048
Add Override marker and fix indention
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Mon, 16 Dec 2013 12:41:16 +0100 (2013-12-16) |
parents | c130196389df |
children | 75ef6963f1c9 |
files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightData.java |
diffstat | 1 files changed, 24 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightData.java Mon Dec 16 12:26:52 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightData.java Mon Dec 16 12:41:16 2013 +0100 @@ -191,30 +191,31 @@ } } - public int compareTo(MiddleBedHeightData other) { - - int descCompared = description.compareTo(other.getDescription()); - - if (descCompared != 0) { - return descCompared; - } + @Override + public int compareTo(MiddleBedHeightData other) { - if (size() == 0 || other.size() == 0) { - if (size() == 0 && other.size() > 0) { - return 1; - } else if (size() > 0 && other.size() == 0) { - return -1; - } else if (size() == 0 && other.size() == 0) { - return 0; - } - } + int descCompared = description.compareTo(other.getDescription()); - if (getKM(0) < other.getKM(0)) { - return -1; - } else if (getKM(0) > other.getKM(0)) { - return 1; - } - return 0; - } + if (descCompared != 0) { + return descCompared; + } + + if (size() == 0 || other.size() == 0) { + if (size() == 0 && other.size() > 0) { + return 1; + } else if (size() > 0 && other.size() == 0) { + return -1; + } else if (size() == 0 && other.size() == 0) { + return 0; + } + } + + if (getKM(0) < other.getKM(0)) { + return -1; + } else if (getKM(0) > other.getKM(0)) { + return 1; + } + return 0; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :