Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/model/CrossSection.java @ 8856:5e38e2924c07 3.2.x
Fix code style.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Thu, 18 Jan 2018 20:12:01 +0100 |
parents | 8abe94270f32 |
children | 8d6e56e57c4a 0a5239a1e46e |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/model/CrossSection.java Thu Jan 18 20:10:59 2018 +0100 +++ b/backend/src/main/java/org/dive4elements/river/model/CrossSection.java Thu Jan 18 20:12:01 2018 +0100 @@ -67,7 +67,8 @@ " GROUP BY cross_section_id" + ") cs_ranges " + "JOIN cross_sections cs ON cs_ranges.cross_section_id = cs.id " + - "LEFT OUTER JOIN time_intervals ON cs.time_interval_id = time_intervals.id " + + "LEFT OUTER JOIN time_intervals " + + " ON cs.time_interval_id = time_intervals.id " + "WHERE :km BETWEEN minkm AND maxkm " + "ORDER BY stop_time desc, start_time desc, :km - minkm"; // Order by time interval missing. @@ -167,7 +168,8 @@ ) { Session session = SessionHolder.HOLDER.get(); - SQLQuery sqlQuery = session.createSQLQuery(SQL_FAST_CROSS_SECTION_LINES) + SQLQuery sqlQuery = session.createSQLQuery( + SQL_FAST_CROSS_SECTION_LINES) .addScalar("km", StandardBasicTypes.DOUBLE) .addScalar("x", StandardBasicTypes.DOUBLE) .addScalar("y", StandardBasicTypes.DOUBLE) @@ -220,10 +222,11 @@ } /** - * True if the given section is the "newest" for that river and has values at km. + * True if the given section is the "newest" for that river + * and has values at km. * @param km Given station. - * @return true if the section has the most advanced end of its validity interval - * or the most advanced start of its validity interval. + * @return true if the section has the most advanced end of its validity + * interval or the most advanced start of its validity interval. */ public boolean shouldBeMaster(double km) { Session session = SessionHolder.HOLDER.get();