Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java @ 7463:52c364813cb1
Code cleanup.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 30 Oct 2013 11:56:13 +0100 |
| parents | 2733b4aae74b |
| children | 41d9014bfa02 |
comparison
equal
deleted
inserted
replaced
| 7462:906ed0b1f3f1 | 7463:52c364813cb1 |
|---|---|
| 75 public void setDensities(Map<Integer, List<SedimentDensityValue>> densities) { | 75 public void setDensities(Map<Integer, List<SedimentDensityValue>> densities) { |
| 76 this.densities = densities; | 76 this.densities = densities; |
| 77 } | 77 } |
| 78 | 78 |
| 79 public void addDensity(double km, double density, int year) { | 79 public void addDensity(double km, double density, int year) { |
| 80 | |
| 80 logger.debug("adding " + year); | 81 logger.debug("adding " + year); |
| 81 if (this.densities.containsKey(year)) { | 82 |
| 82 List<SedimentDensityValue> list = this.densities.get(year); | 83 Integer key = Integer.valueOf(year); |
| 83 list.add(new SedimentDensityValue(km, density, year)); | 84 |
| 84 } | 85 List<SedimentDensityValue> list = densities.get(key); |
| 85 else { | 86 |
| 86 List<SedimentDensityValue> list = | 87 if (list == null) { |
| 87 new ArrayList<SedimentDensityValue>(); | 88 list = new ArrayList<SedimentDensityValue>(); |
| 88 list.add(new SedimentDensityValue(km, density, year)); | 89 densities.put(key, list); |
| 89 densities.put(year, list); | 90 } |
| 90 } | 91 |
| 91 if (!this.years.contains(new Integer(year))) { | 92 list.add(new SedimentDensityValue(km, density, year)); |
| 93 | |
| 94 // XXX: Why do we store a redundant list of years, too? | |
| 95 // Years are the keys of densities so they can be easily | |
| 96 // accessed by their key set! | |
| 97 if (!years.contains(key)) { | |
| 92 logger.debug("new year"); | 98 logger.debug("new year"); |
| 93 years.add(new Integer(year)); | 99 years.add(key); |
| 94 } | 100 } |
| 95 } | 101 } |
| 96 | 102 |
| 97 public List<Integer> getYears() { | 103 public List<Integer> getYears() { |
| 98 return years; | 104 return years; |