Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeights.java @ 9087:fb976ea01463
Fixed :bed heights finder did not consider the river correctly
| author | gernotbelger |
|---|---|
| date | Fri, 25 May 2018 10:47:38 +0200 |
| parents | 11bf13cf0463 |
| children | 82917e414d76 |
comparison
equal
deleted
inserted
replaced
| 9086:b5dbcbaed42b | 9087:fb976ea01463 |
|---|---|
| 101 problems.addProblem("sinfo.bedheightsfinder.configfile.loaderror", CONFIG_FILE, e.getMessage()); | 101 problems.addProblem("sinfo.bedheightsfinder.configfile.loaderror", CONFIG_FILE, e.getMessage()); |
| 102 return Collections.emptyList(); | 102 return Collections.emptyList(); |
| 103 } | 103 } |
| 104 } | 104 } |
| 105 | 105 |
| 106 private static List<BedHeight> loadBedHeightsByName(final River shouldBeRiver, final Collection<String> bedHeightNames, final Calculation problems) { | 106 private static List<BedHeight> loadBedHeightsByName(final River river, final Collection<String> bedHeightNames, final Calculation problems) { |
| 107 | 107 |
| 108 final List<BedHeight> bedHeights = new ArrayList<>(bedHeightNames.size()); | 108 final List<BedHeight> bedHeights = new ArrayList<>(bedHeightNames.size()); |
| 109 | 109 |
| 110 for (final String name : bedHeightNames) { | 110 for (final String name : bedHeightNames) { |
| 111 try { | 111 try { |
| 112 final BedHeight bedHeight = BedHeight.getBedHeightByDescription(name); | 112 final BedHeight bedHeight = BedHeight.getBedHeightByDescription(river, name); |
| 113 if (bedHeight == null) | 113 if (bedHeight == null) |
| 114 problems.addProblem("sinfo.bedheightsfinder.missingdescription", name); | 114 problems.addProblem("sinfo.bedheightsfinder.missingdescription", river.getName(), name); |
| 115 else { | 115 else |
| 116 final River river = bedHeight.getRiver(); | 116 bedHeights.add(bedHeight); |
| 117 if (!shouldBeRiver.getId().equals(river.getId())) | |
| 118 problems.addProblem("sinfo.bedheightsfinder.wrongriver", name, shouldBeRiver.getName()); | |
| 119 else | |
| 120 bedHeights.add(bedHeight); | |
| 121 } | |
| 122 } | 117 } |
| 123 catch (final Exception e) { | 118 catch (final Exception e) { |
| 124 e.printStackTrace(); | 119 e.printStackTrace(); |
| 125 problems.addProblem("sinfo.bedheightsfinder.missingdescription", name); | 120 problems.addProblem("sinfo.bedheightsfinder.missingdescription", name); |
| 126 } | 121 } |