Mercurial > dive4elements > river
changeset 3952:5d8db3349b77
Backend: Code simplification. Removed trailing whietspace.
flys-backend/trunk@5605 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 27 Sep 2012 08:08:38 +0000 |
| parents | 89ada0b9083f |
| children | fc32a4955087 |
| files | flys-backend/ChangeLog flys-backend/src/main/java/de/intevation/flys/importer/ImportElevationModel.java flys-backend/src/main/java/de/intevation/flys/model/BedHeightSingle.java flys-backend/src/main/java/de/intevation/flys/utils/DgmSqlConverter.java |
| diffstat | 4 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-backend/ChangeLog Thu Sep 27 07:24:07 2012 +0000 +++ b/flys-backend/ChangeLog Thu Sep 27 08:08:38 2012 +0000 @@ -1,3 +1,12 @@ +2012-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/model/BedHeightSingle.java: + Replaced labeled continue by a simple break. + + * src/main/java/de/intevation/flys/utils/DgmSqlConverter.java, + src/main/java/de/intevation/flys/importer/ImportElevationModel.java: + Removed trailing whitespace. + 2012-09-27 Ingo Weinzierl <ingo@intevation.de> * doc/schema/postgresql-spatial.sql:
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportElevationModel.java Thu Sep 27 07:24:07 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/ImportElevationModel.java Thu Sep 27 08:08:38 2012 +0000 @@ -37,7 +37,7 @@ log.warn("No elevation model specified."); return null; } - + if (peer == null) { Session session = ImporterSession.getInstance().getDatabaseSession(); Query query = session.createQuery(
--- a/flys-backend/src/main/java/de/intevation/flys/model/BedHeightSingle.java Thu Sep 27 07:24:07 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/BedHeightSingle.java Thu Sep 27 08:08:38 2012 +0000 @@ -241,13 +241,13 @@ List<BedHeightSingle> singles = query.list(); List<BedHeightSingle> good = new ArrayList<BedHeightSingle>(); - OUTER: for (BedHeightSingle s: singles) { + for (BedHeightSingle s: singles) { for (BedHeightSingleValue value: s.getValues()) { double station = value.getStation().doubleValue(); if (station >= kmLo && station <= kmHi) { good.add(s); - continue OUTER; + break; } } }
--- a/flys-backend/src/main/java/de/intevation/flys/utils/DgmSqlConverter.java Thu Sep 27 07:24:07 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/utils/DgmSqlConverter.java Thu Sep 27 08:08:38 2012 +0000 @@ -40,9 +40,9 @@ * </ol> * <ol><b>full</b>: Accepts true|false values. If true is set, all rivers * included in the CSV file are taken into account while parsing. Otherwise, - * the converter reads information for 'Saar', 'Mosel' and 'Eble' only.</ol> + * the converter reads information for 'Saar', 'Mosel' and 'Eble' only.</ol> * </ul> - * + * * @author Ingo Weinzierl <a href="mailto:ingo.weinzierl@intevation.de"> * ingo.weinzierl@intevation.de</a> * @@ -266,7 +266,7 @@ public void read() { info("Read DGM information from CSV file: " + csv.getAbsolutePath()); - + InputStream in = null; try { @@ -457,7 +457,7 @@ public void write() { info("Write DEM information to SQL file: " + sql.getAbsolutePath()); - + BufferedWriter bufferedWriter = null; try { bufferedWriter = new BufferedWriter(new FileWriter(sql));