Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java @ 3203:1b9f791937c3
Moved FixationArtifactAccess to new access package.
flys-artifacts/trunk@4820 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Thu, 28 Jun 2012 08:16:20 +0000 |
parents | cd309f8597f6 |
children | 19ce06eb56c3 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Wed Jun 27 17:29:33 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Thu Jun 28 08:16:20 2012 +0000 @@ -1,38 +1,37 @@ package de.intevation.flys.artifacts.states.fixation; -import java.text.DateFormat; - import de.intevation.artifactdatabase.state.Facet; import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.FixationArtifactAccess; + +import de.intevation.flys.artifacts.access.FixationArtifactAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.ReportFacet; -import de.intevation.flys.artifacts.model.fixings.FixCalculation; - -import de.intevation.flys.artifacts.model.fixings.FixAvSectorFacet; +import de.intevation.flys.artifacts.model.fixings.DateRange; import de.intevation.flys.artifacts.model.fixings.FixAnalysisEventsFacet; import de.intevation.flys.artifacts.model.fixings.FixAnalysisPeriodsFacet; -import de.intevation.flys.artifacts.model.fixings.FixReferenceEventsFacet; -import de.intevation.flys.artifacts.model.fixings.FixOutlierFacet; -import de.intevation.flys.artifacts.model.fixings.FixWQCurveFacet; +import de.intevation.flys.artifacts.model.fixings.FixAvSectorFacet; +import de.intevation.flys.artifacts.model.fixings.FixCalculation; import de.intevation.flys.artifacts.model.fixings.FixDerivateFacet; import de.intevation.flys.artifacts.model.fixings.FixDeviationFacet; import de.intevation.flys.artifacts.model.fixings.FixLongitudinalAnalysisFacet; import de.intevation.flys.artifacts.model.fixings.FixLongitudinalDeviationFacet; import de.intevation.flys.artifacts.model.fixings.FixLongitudinalReferenceFacet; +import de.intevation.flys.artifacts.model.fixings.FixOutlierFacet; +import de.intevation.flys.artifacts.model.fixings.FixReferenceEventsFacet; +import de.intevation.flys.artifacts.model.fixings.FixWQCurveFacet; -import de.intevation.flys.artifacts.model.fixings.DateRange; +import de.intevation.flys.artifacts.resources.Resources; import de.intevation.flys.artifacts.states.DefaultState; -import de.intevation.flys.artifacts.resources.Resources; +import java.text.DateFormat; import java.util.List; @@ -98,6 +97,7 @@ ) { log.debug("FixationCompute.computeAdvance"); + CalculationResult res; FixationArtifactAccess access = @@ -105,8 +105,10 @@ if (old instanceof CalculationResult) { res = (CalculationResult)old; + log.debug("---------- Using result from Cache --------"); } else { + log.debug("+++++++++ Recalculating +++++++"); FixCalculation calc = new FixCalculation(access); @@ -123,7 +125,7 @@ facets.add( new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id)); - int maxId = -100; + int maxId = -100; int count = access.getAnalysisPeriods().length;