Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/SedimentLoadDataCalculate.java @ 8126:353f93d5d9f7
Correctly output problems in SedimentLoadDataCalculate
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Mon, 25 Aug 2014 16:04:35 +0200 |
| parents | f01c65261963 |
| children | 45b1d71110c3 |
comparison
equal
deleted
inserted
replaced
| 8125:f01c65261963 | 8126:353f93d5d9f7 |
|---|---|
| 19 import org.dive4elements.artifacts.CallContext; | 19 import org.dive4elements.artifacts.CallContext; |
| 20 import org.dive4elements.artifacts.CallMeta; | 20 import org.dive4elements.artifacts.CallMeta; |
| 21 import org.dive4elements.river.artifacts.D4EArtifact; | 21 import org.dive4elements.river.artifacts.D4EArtifact; |
| 22 import org.dive4elements.river.artifacts.access.SedimentLoadAccess; | 22 import org.dive4elements.river.artifacts.access.SedimentLoadAccess; |
| 23 import org.dive4elements.river.artifacts.model.CalculationResult; | 23 import org.dive4elements.river.artifacts.model.CalculationResult; |
| 24 import org.dive4elements.river.artifacts.model.Calculation; | |
| 24 import org.dive4elements.river.artifacts.model.DataFacet; | 25 import org.dive4elements.river.artifacts.model.DataFacet; |
| 25 import org.dive4elements.river.artifacts.model.FacetTypes; | 26 import org.dive4elements.river.artifacts.model.FacetTypes; |
| 26 import org.dive4elements.river.artifacts.model.ReportFacet; | 27 import org.dive4elements.river.artifacts.model.ReportFacet; |
| 27 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataCalculation; | 28 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadDataCalculation; |
| 28 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadLSData; | 29 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadLSData; |
| 143 | 144 |
| 144 CalculationResult res = old instanceof CalculationResult | 145 CalculationResult res = old instanceof CalculationResult |
| 145 ? (CalculationResult) old | 146 ? (CalculationResult) old |
| 146 : new SedimentLoadDataCalculation().calculate(access); | 147 : new SedimentLoadDataCalculation().calculate(access); |
| 147 | 148 |
| 148 SedimentLoadDataResult sdRes; | |
| 149 | 149 |
| 150 if (res == null) { | 150 if (res == null) { |
| 151 logger.error ("No calculation result."); | 151 logger.error ("No calculation result."); |
| 152 } | 152 } |
| 153 | 153 |
| 154 Object raw = res.getData(); | 154 Object raw = res.getData(); |
| 155 if (raw == null) { | 155 if (raw == null) { |
| 156 logger.warn("No result data."); | 156 logger.warn("No result data."); |
| 157 Calculation report = res.getReport(); | |
| 158 if (report != null) { | |
| 159 logger.warn ("Problems : " + report.problemsToString()); | |
| 160 } | |
| 157 return res; | 161 return res; |
| 158 } | 162 } |
| 159 | 163 |
| 164 SedimentLoadDataResult sdRes; | |
| 160 if (raw instanceof SedimentLoadDataResult) { | 165 if (raw instanceof SedimentLoadDataResult) { |
| 161 sdRes = (SedimentLoadDataResult) raw; | 166 sdRes = (SedimentLoadDataResult) raw; |
| 162 } else if (raw instanceof SedimentLoadDataCalculation) { | |
| 163 SedimentLoadDataCalculation calc = (SedimentLoadDataCalculation) raw; | |
| 164 logger.warn ("Problems : " + calc.problemsToString()); | |
| 165 return calc; | |
| 166 } else { | 167 } else { |
| 167 logger.error ("Unknown result"); | 168 logger.error ("Unknown result"); |
| 168 return null; | 169 return null; |
| 169 } | 170 } |
| 170 | 171 |