Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java @ 8025:c915e99d9e52
Renamed SedimentYield to SedimentLoadLS and SedimentYieldValue to SedimentLoadLSValue. Adjust the names of the parsers and the rest of the glue.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Wed, 09 Jul 2014 18:13:13 +0200 |
parents | 5813c206ff64 |
children | 6954ac9b7591 |
comparison
equal
deleted
inserted
replaced
8024:963ede7b32bb | 8025:c915e99d9e52 |
---|---|
27 import org.dive4elements.river.importer.parsers.PRFParser; | 27 import org.dive4elements.river.importer.parsers.PRFParser; |
28 import org.dive4elements.river.importer.parsers.PegelGltParser; | 28 import org.dive4elements.river.importer.parsers.PegelGltParser; |
29 import org.dive4elements.river.importer.parsers.PorosityParser; | 29 import org.dive4elements.river.importer.parsers.PorosityParser; |
30 import org.dive4elements.river.importer.parsers.SQRelationParser; | 30 import org.dive4elements.river.importer.parsers.SQRelationParser; |
31 import org.dive4elements.river.importer.parsers.SedimentDensityParser; | 31 import org.dive4elements.river.importer.parsers.SedimentDensityParser; |
32 import org.dive4elements.river.importer.parsers.SedimentYieldParser; | 32 import org.dive4elements.river.importer.parsers.SedimentLoadLSParser; |
33 import org.dive4elements.river.importer.parsers.W80Parser; | 33 import org.dive4elements.river.importer.parsers.W80Parser; |
34 import org.dive4elements.river.importer.parsers.W80CSVParser; | 34 import org.dive4elements.river.importer.parsers.W80CSVParser; |
35 import org.dive4elements.river.importer.parsers.WaterlevelDifferencesParser; | 35 import org.dive4elements.river.importer.parsers.WaterlevelDifferencesParser; |
36 import org.dive4elements.river.importer.parsers.WaterlevelParser; | 36 import org.dive4elements.river.importer.parsers.WaterlevelParser; |
37 import org.dive4elements.river.importer.parsers.WstParser; | 37 import org.dive4elements.river.importer.parsers.WstParser; |
593 } | 593 } |
594 | 594 |
595 | 595 |
596 private void parseSedimentYieldDir( | 596 private void parseSedimentYieldDir( |
597 File[] files, | 597 File[] files, |
598 SedimentYieldParser parser | 598 SedimentLoadLSParser parser |
599 ) throws IOException { | 599 ) throws IOException { |
600 for (File file: files) { | 600 for (File file: files) { |
601 if (file.isDirectory()) { | 601 if (file.isDirectory()) { |
602 for (File child: file.listFiles()) { | 602 for (File child: file.listFiles()) { |
603 parser.parse(child); | 603 parser.parse(child); |
626 | 626 |
627 File[] singles = singleDir.listFiles(); | 627 File[] singles = singleDir.listFiles(); |
628 File[] epochs = epochDir.listFiles(); | 628 File[] epochs = epochDir.listFiles(); |
629 File[] offEpochs = offEpochDir.listFiles(); | 629 File[] offEpochs = offEpochDir.listFiles(); |
630 | 630 |
631 SedimentYieldParser parser = new SedimentYieldParser(); | 631 SedimentLoadLSParser parser = new SedimentLoadLSParser(); |
632 | 632 |
633 if (singles == null || singles.length == 0) { | 633 if (singles == null || singles.length == 0) { |
634 log.warn("Cannot read directory '" + singleDir + "'"); | 634 log.warn("Cannot read directory '" + singleDir + "'"); |
635 } | 635 } |
636 else { | 636 else { |