Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/model/River.java @ 4809:8062b571884d
Bugs in generated RiverAxis Mapfile fixed. Now the river axes are drawn by the WMS.
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Wed, 16 Jan 2013 22:53:58 +0100 |
parents | 87c3a3ac6ddf |
children |
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/model/River.java Wed Jan 16 11:39:37 2013 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/model/River.java Wed Jan 16 22:53:58 2013 +0100 @@ -1,31 +1,29 @@ package de.intevation.flys.model; +import de.intevation.flys.backend.SessionHolder; + import java.io.Serializable; - import java.math.BigDecimal; import java.math.MathContext; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.GeneratedValue; -import javax.persistence.Column; -import javax.persistence.SequenceGenerator; +import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.OrderBy; -import javax.persistence.JoinColumn; -import javax.persistence.GenerationType; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; -import java.util.List; -import java.util.Comparator; -import java.util.Map; -import java.util.TreeMap; - +import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.Query; - -import de.intevation.flys.backend.SessionHolder; @Entity @@ -37,7 +35,7 @@ public static final double EPSILON = 1e-5; - public static final Comparator KM_CMP = new Comparator<Double>() { + public static final Comparator<Double> KM_CMP = new Comparator<Double>() { @Override public int compare(Double a, Double b) { double diff = a - b; @@ -147,6 +145,7 @@ + @Override public String toString() { return name != null ? name : ""; }