Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java @ 3411:0ef83077c93f
FixA: Renamed FixCalculation to FixAnalysisCalculation.
flys-artifacts/trunk@5064 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 19 Jul 2012 14:11:11 +0000 |
| parents | 50d61a2494cb |
| children |
comparison
equal
deleted
inserted
replaced
| 3410:f382127df48e | 3411:0ef83077c93f |
|---|---|
| 15 import de.intevation.flys.artifacts.model.ReportFacet; | 15 import de.intevation.flys.artifacts.model.ReportFacet; |
| 16 | 16 |
| 17 import de.intevation.flys.artifacts.model.fixings.FixAnalysisEventsFacet; | 17 import de.intevation.flys.artifacts.model.fixings.FixAnalysisEventsFacet; |
| 18 import de.intevation.flys.artifacts.model.fixings.FixAnalysisPeriodsFacet; | 18 import de.intevation.flys.artifacts.model.fixings.FixAnalysisPeriodsFacet; |
| 19 import de.intevation.flys.artifacts.model.fixings.FixAvSectorFacet; | 19 import de.intevation.flys.artifacts.model.fixings.FixAvSectorFacet; |
| 20 import de.intevation.flys.artifacts.model.fixings.FixCalculation; | 20 import de.intevation.flys.artifacts.model.fixings.FixAnalysisCalculation; |
| 21 import de.intevation.flys.artifacts.model.fixings.FixDerivateFacet; | 21 import de.intevation.flys.artifacts.model.fixings.FixDerivateFacet; |
| 22 import de.intevation.flys.artifacts.model.fixings.FixDeviationFacet; | 22 import de.intevation.flys.artifacts.model.fixings.FixDeviationFacet; |
| 23 import de.intevation.flys.artifacts.model.fixings.FixLongitudinalAnalysisFacet; | 23 import de.intevation.flys.artifacts.model.fixings.FixLongitudinalAnalysisFacet; |
| 24 import de.intevation.flys.artifacts.model.fixings.FixLongitudinalDeviationFacet; | 24 import de.intevation.flys.artifacts.model.fixings.FixLongitudinalDeviationFacet; |
| 25 import de.intevation.flys.artifacts.model.fixings.FixLongitudinalReferenceFacet; | 25 import de.intevation.flys.artifacts.model.fixings.FixLongitudinalReferenceFacet; |
| 94 | 94 |
| 95 if (old instanceof CalculationResult) { | 95 if (old instanceof CalculationResult) { |
| 96 res = (CalculationResult)old; | 96 res = (CalculationResult)old; |
| 97 } | 97 } |
| 98 else { | 98 else { |
| 99 FixCalculation calc = new FixCalculation(access); | 99 FixAnalysisCalculation calc = new FixAnalysisCalculation(access); |
| 100 res = calc.calculate(); | 100 res = calc.calculate(); |
| 101 } | 101 } |
| 102 | 102 |
| 103 if (facets == null) { | 103 if (facets == null) { |
| 104 return res; | 104 return res; |