Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/BedQualityCalculation.java @ 3780:7fa38f8bcd8d
Avoid NPE if the user selects onlyone sort of characteristic diameter.
flys-artifacts/trunk@5487 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 17 Sep 2012 09:16:20 +0000 |
| parents | 5a8f8fd5310c |
| children | 9f9d5ada96ca d8c99ff18db8 |
comparison
equal
deleted
inserted
replaced
| 3779:3530e23e5c3e | 3780:7fa38f8bcd8d |
|---|---|
| 97 river, | 97 river, |
| 98 from, | 98 from, |
| 99 to, | 99 to, |
| 100 dr.getFrom(), | 100 dr.getFrom(), |
| 101 dr.getTo()); | 101 dr.getTo()); |
| 102 | 102 if (bedDiameter != null) { |
| 103 for (String bd : bedDiameter) { | 103 for (String bd : bedDiameter) { |
| 104 BedQualityResult bedResult = | 104 BedQualityResult bedResult = |
| 105 calculateBed(bedMeasurements, bd, dr); | 105 calculateBed(bedMeasurements, bd, dr); |
| 106 | 106 |
| 107 //Avoid adding empty result sets. | 107 // Avoid adding empty result sets. |
| 108 if (!bedResult.isEmpty()) { | 108 if (!bedResult.isEmpty()) { |
| 109 results.add(bedResult); | 109 results.add(bedResult); |
| 110 } | |
| 110 } | 111 } |
| 111 } | 112 } |
| 112 for (String bld : bedloadDiameter) { | 113 if (bedloadDiameter != null) { |
| 113 BedQualityResult loadResult = | 114 for (String bld : bedloadDiameter) { |
| 114 calculateBedload(loadMeasurements, bld, dr); | 115 BedQualityResult loadResult = |
| 115 results.add(loadResult); | 116 calculateBedload(loadMeasurements, bld, dr); |
| 117 results.add(loadResult); | |
| 118 } | |
| 116 } | 119 } |
| 117 } | 120 } |
| 118 | 121 |
| 119 return new CalculationResult( | 122 return new CalculationResult( |
| 120 results.toArray(new BedQualityResult[results.size()]), this); | 123 results.toArray(new BedQualityResult[results.size()]), this); |