Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java @ 7927:07cc4cd9233e
Add new DateUtil class.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Thu, 12 Jun 2014 12:21:55 +0200 |
| parents | 9ec6def1a7dd |
| children |
comparison
equal
deleted
inserted
replaced
| 7926:e3b74679b2b4 | 7927:07cc4cd9233e |
|---|---|
| 25 import org.dive4elements.river.importer.ImportSedimentYield; | 25 import org.dive4elements.river.importer.ImportSedimentYield; |
| 26 import org.dive4elements.river.importer.ImportSedimentYieldValue; | 26 import org.dive4elements.river.importer.ImportSedimentYieldValue; |
| 27 import org.dive4elements.river.importer.ImportTimeInterval; | 27 import org.dive4elements.river.importer.ImportTimeInterval; |
| 28 import org.dive4elements.river.importer.ImportUnit; | 28 import org.dive4elements.river.importer.ImportUnit; |
| 29 import org.dive4elements.river.model.GrainFraction; | 29 import org.dive4elements.river.model.GrainFraction; |
| 30 import org.dive4elements.river.utils.DateUtil; | |
| 30 | 31 |
| 31 | 32 |
| 32 /** Parses Sediment Yield files. */ | 33 /** Parses Sediment Yield files. */ |
| 33 public class SedimentYieldParser extends LineParser { | 34 public class SedimentYieldParser extends LineParser { |
| 34 | 35 |
| 273 if (a.matches()) { | 274 if (a.matches()) { |
| 274 int yearA = nf.parse(a.group(1)).intValue(); | 275 int yearA = nf.parse(a.group(1)).intValue(); |
| 275 int yearB = nf.parse(a.group(2)).intValue(); | 276 int yearB = nf.parse(a.group(2)).intValue(); |
| 276 | 277 |
| 277 return new ImportTimeInterval( | 278 return new ImportTimeInterval( |
| 278 getStartDateFromYear(yearA), | 279 DateUtil.getStartDateFromYear(yearA), |
| 279 getEndDateFromYear(yearB) | 280 DateUtil.getEndDateFromYear(yearB) |
| 280 ); | 281 ); |
| 281 } | 282 } |
| 282 | 283 |
| 283 Matcher b = TIMEINTERVAL_SINGLE.matcher(column); | 284 Matcher b = TIMEINTERVAL_SINGLE.matcher(column); |
| 284 if (b.matches()) { | 285 if (b.matches()) { |
| 285 int year = nf.parse(b.group(1)).intValue(); | 286 int year = nf.parse(b.group(1)).intValue(); |
| 286 | 287 |
| 287 return new ImportTimeInterval(getStartDateFromYear(year)); | 288 return new ImportTimeInterval(DateUtil.getStartDateFromYear(year)); |
| 288 } | 289 } |
| 289 | 290 |
| 290 log.warn("SYP: Unknown time interval string: '" + column + "'"); | 291 log.warn("SYP: Unknown time interval string: '" + column + "'"); |
| 291 } | 292 } |
| 292 catch (ParseException pe) { | 293 catch (ParseException pe) { |