Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.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 | 665c8326b1a6 |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java Thu Jan 18 20:10:59 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java Thu Jan 18 20:12:01 2018 +0100 @@ -24,7 +24,8 @@ public class SedimentLoadDataFactory { - private static Logger log = Logger.getLogger(SedimentLoadDataFactory.class); + private static Logger log = Logger.getLogger( + SedimentLoadDataFactory.class); public static final String CACHE_NAME = "sediment-load-data"; @@ -40,7 +41,8 @@ "sl.sq_time_interval_id " + "FROM sediment_load sl " + "JOIN sediment_load_values slv ON sl.id = slv.sediment_load_id " + - "JOIN measurement_station ms ON ms.id = slv.measurement_station_id " + + "JOIN measurement_station ms " + + "ON ms.id = slv.measurement_station_id " + "JOIN ranges rs ON rs.id = ms.range_id " + "JOIN rivers r ON r.id = rs.river_id " + "WHERE r.name = :river) " + @@ -63,10 +65,12 @@ "JOIN ranges rs ON ms.range_id = rs.id " + "JOIN rivers r ON rs.river_id = r.id " + "JOIN time_intervals ti ON sl.time_interval_id = ti.id " + - "LEFT JOIN time_intervals sqti ON sl.sq_time_interval_id = sqti.id " + + "LEFT JOIN time_intervals sqti " + + "ON sl.sq_time_interval_id = sqti.id " + "JOIN grain_fraction gf ON sl.grain_fraction_id = gf.id " + "LEFT JOIN sediment_load_values slv " + - "ON ms.id=slv.measurement_station_id AND sl.id=slv.sediment_load_id " + + "ON ms.id=slv.measurement_station_id " + + "AND sl.id=slv.sediment_load_id " + "WHERE (" + "(ms.measurement_type='Geschiebe' AND gf.name IN " + "('coarse', 'fine_middle', 'sand', 'susp_sand', " + @@ -129,7 +133,8 @@ Session session = SessionHolder.HOLDER.get(); - SQLQuery sqlQuery = session.createSQLQuery(SQL_LOAD_RIVER_SEDIMENT_LOADS) + SQLQuery sqlQuery = session.createSQLQuery( + SQL_LOAD_RIVER_SEDIMENT_LOADS) .addScalar("sl_id", StandardBasicTypes.INTEGER) .addScalar("sl_kind", StandardBasicTypes.INTEGER) .addScalar("sl_description", StandardBasicTypes.STRING)