Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedQualityAccess.java @ 6258:11d76162eca1
Never return 'null' for bed(load) diameters.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Tue, 11 Jun 2013 09:14:12 +0200 |
| parents | a0078e5e3b39 |
| children | e4606eae8ea5 |
comparison
equal
deleted
inserted
replaced
| 6257:165f60f420cf | 6258:11d76162eca1 |
|---|---|
| 6 * documentation coming with Dive4Elements River for details. | 6 * documentation coming with Dive4Elements River for details. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 package org.dive4elements.river.artifacts.access; | 9 package org.dive4elements.river.artifacts.access; |
| 10 | 10 |
| 11 import java.util.ArrayList; | |
| 11 import java.util.Date; | 12 import java.util.Date; |
| 12 import java.util.LinkedList; | 13 import java.util.LinkedList; |
| 13 import java.util.List; | 14 import java.util.List; |
| 14 | 15 |
| 15 import org.apache.log4j.Logger; | 16 import org.apache.log4j.Logger; |
| 46 public List<String> getBedDiameter() { | 47 public List<String> getBedDiameter() { |
| 47 String value = getString("bed_diameter"); | 48 String value = getString("bed_diameter"); |
| 48 if (bedDiameter == null && value != null) { | 49 if (bedDiameter == null && value != null) { |
| 49 bedDiameter = extractDiameter(value); | 50 bedDiameter = extractDiameter(value); |
| 50 } | 51 } |
| 52 if (bedDiameter == null) { | |
| 53 return new ArrayList<String>(); | |
| 54 } | |
| 51 return bedDiameter; | 55 return bedDiameter; |
| 52 } | 56 } |
| 53 | 57 |
| 54 public List<String> getBedloadDiameter() { | 58 public List<String> getBedloadDiameter() { |
| 55 String value = getString("load_diameter"); | 59 String value = getString("load_diameter"); |
| 56 if (bedloadDiameter == null && value != null) { | 60 if (bedloadDiameter == null && value != null) { |
| 57 bedloadDiameter = extractDiameter(value); | 61 bedloadDiameter = extractDiameter(value); |
| 62 } | |
| 63 if (bedloadDiameter == null) { | |
| 64 return new ArrayList<String>(); | |
| 58 } | 65 } |
| 59 return bedloadDiameter; | 66 return bedloadDiameter; |
| 60 } | 67 } |
| 61 | 68 |
| 62 private List<DateRange> extractRanges(String dateString) { | 69 private List<DateRange> extractRanges(String dateString) { |