Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/SedimentYieldParser.java @ 7340:2ce7bacc940f double-precision
Merged changes from default into double precision branch.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 15 Oct 2013 18:41:55 +0200 |
| parents | c894b7b45c4c |
| children | 9ec6def1a7dd |
comparison
equal
deleted
inserted
replaced
| 7334:f7d3fc619976 | 7340:2ce7bacc940f |
|---|---|
| 377 } | 377 } |
| 378 | 378 |
| 379 | 379 |
| 380 public static String getGrainFractionTypeName(String filename) { | 380 public static String getGrainFractionTypeName(String filename) { |
| 381 if (Pattern.matches(FRACTION_COARSE_STR, filename)) { | 381 if (Pattern.matches(FRACTION_COARSE_STR, filename)) { |
| 382 return GrainFraction.COARSE; | 382 return GrainFraction.COARSE; |
| 383 } | 383 } |
| 384 else if (Pattern.matches(FRACTION_FINE_MIDDLE_STR, filename)) { | 384 else if (Pattern.matches(FRACTION_FINE_MIDDLE_STR, filename)) { |
| 385 return GrainFraction.FINE_MIDDLE; | 385 return GrainFraction.FINE_MIDDLE; |
| 386 } | 386 } |
| 387 else if (Pattern.matches(FRACTION_SUSP_SAND_BED, filename) || | 387 else if (Pattern.matches(FRACTION_SUSP_SAND_BED, filename) || |
| 389 return GrainFraction.SUSP_SAND_BED; | 389 return GrainFraction.SUSP_SAND_BED; |
| 390 } | 390 } |
| 391 else if (Pattern.matches(FRACTION_SUSP_SAND, filename)) { | 391 else if (Pattern.matches(FRACTION_SUSP_SAND, filename)) { |
| 392 return GrainFraction.SUSP_SAND; | 392 return GrainFraction.SUSP_SAND; |
| 393 } | 393 } |
| 394 else if (Pattern.matches(FRACTION_SAND, filename)) { | 394 else if (Pattern.matches(FRACTION_SAND, filename)) { |
| 395 return GrainFraction.SAND; | 395 return GrainFraction.SAND; |
| 396 } | 396 } |
| 397 else if (Pattern.matches(FRACTION_SUSPENDED_SEDIMENT, filename)) { | 397 else if (Pattern.matches(FRACTION_SUSPENDED_SEDIMENT, filename)) { |
| 398 return GrainFraction.SUSPENDED_SEDIMENT; | 398 return GrainFraction.SUSPENDED_SEDIMENT; |
| 399 } | 399 } |