Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeightsConfig.java @ 9469:6acd22e86951
Improvements on Config-Files
| author | gernotbelger |
|---|---|
| date | Tue, 04 Sep 2018 16:42:03 +0200 |
| parents | eedb0bcf226b |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeightsConfig.java Fri Aug 31 17:11:32 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeightsConfig.java Tue Sep 04 16:42:03 2018 +0200 @@ -29,8 +29,7 @@ */ final class DefaultBedHeightsConfig { - private static final String CONFIG_FILE = "sinfo_tkh_sohlhoehen_%s.properties"; - + private static final String CONFIG_FILE = "standard_sohlhoehen_%s.properties"; public static class DefaultBedHeight { @@ -56,7 +55,6 @@ private DefaultBedHeightsConfig() { } - private synchronized Collection<DefaultBedHeight> getBedHeightDefaultsForRiver(final River river, final Calculation problems) { final String rivername = river.getName(); @@ -75,7 +73,7 @@ final String rivername = river.getName(); final String filename = String.format(CONFIG_FILE, rivername); - final Properties properties = Config.loadProperties(filename); + final Properties properties = Config.loadProperties(filename, Config.getModulesConfigDirectory()); final Set<String> keys = properties.stringPropertyNames();