Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Fri Jan 19 11:23:42 2018 +0100 @@ -191,17 +191,21 @@ try { tableId = Integer.parseInt(ids[1]); } catch (NumberFormatException e) { - log.error("Discharge tables ids string is wrong." + - " Fromat is <gauge_name>;<discharge_table_id>;<facet_desc>" + - " Fix your Datacage!"); + log.error("Discharge tables ids string is wrong. " + + "Format is " + + "<gauge_name>;<discharge_table_id>;<facet_desc>" + + " Fix your Datacage!"); // Let's rather break down completly then show the wrong data. return null; } - DischargeTable table = DischargeTable.getDischargeTableById(tableId); + DischargeTable table = DischargeTable.getDischargeTableById( + tableId); map = new HashMap<String, double [][]>(); - map.put(getGaugeName(), DischargeTables.loadDischargeTableValues(table)); + map.put(getGaugeName(), DischargeTables.loadDischargeTableValues( + table)); } else { - DischargeTables dt = new DischargeTables(river.getName(), getGaugeName()); + DischargeTables dt = new DischargeTables( + river.getName(), getGaugeName()); map = dt.getValues(); }