# HG changeset patch # User Sascha L. Teichmann # Date 1342702545 0 # Node ID 50d61a2494cb8118b2ccdba7d35bbe5ec6364a8d # Parent 70e9d56e21fcc18d16f0932d95c8ba09d35a9e43 FixA: Renamed FixationArtifactAccess to FixAnalysisAccess flys-artifacts/trunk@5061 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Jul 19 12:55:45 2012 +0000 @@ -1,3 +1,28 @@ +2012-07-19 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java: + Deleted. + + * src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java: + Re-added. + + * src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java, + src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java, + src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java, + src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java: + Adjusted class name usage. + 2012-07-19 Ingo Weinzierl * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java Thu Jul 19 12:55:45 2012 +0000 @@ -0,0 +1,262 @@ +package de.intevation.flys.artifacts.access; + +import de.intevation.artifactdatabase.data.StateData; +import de.intevation.flys.artifacts.FLYSArtifact; +import de.intevation.flys.artifacts.model.DateRange; + +import java.util.Arrays; +import java.util.Date; + +import org.apache.log4j.Logger; + + +public class FixAnalysisAccess +extends Access +{ + private static Logger log = Logger.getLogger(FixAnalysisAccess.class); + + protected String river; + + protected String calculationMode; + + protected Double from; + protected Double to; + protected Double step; + + protected Long start; + protected Long end; + + protected Integer qSectorStart; + protected Integer qSectorEnd; + + protected DateRange referencePeriod; + protected DateRange [] analysisPeriods; + + protected int [] events; + + protected Boolean preprocessing; + + protected String function; + + protected double [] qs; + + public FixAnalysisAccess() { + } + + public FixAnalysisAccess(FLYSArtifact artifact) { + super(artifact); + } + + public String getRiver() { + if (river == null) { + river = getString("river"); + } + if (log.isDebugEnabled()) { + log.debug("river: '" + river + "'"); + } + return river; + } + + public String getCalculationMode() { + if (calculationMode == null) { + calculationMode = getString("calculation.mode"); + } + + if (log.isDebugEnabled()) { + log.debug("calculationMode: '" + calculationMode + "'"); + } + return calculationMode; + } + + public Double getFrom() { + + if (from == null) { + from = getDouble("from"); + } + + if (log.isDebugEnabled()) { + log.debug("from: '" + from + "'"); + } + + return from; + } + + public Double getTo() { + + if (to == null) { + to = getDouble("to"); + } + + if (log.isDebugEnabled()) { + log.debug("to: '" + to + "'"); + } + + return to; + } + + public Double getStep() { + + if (step == null) { + step = getDouble("step"); + } + + if (log.isDebugEnabled()) { + log.debug("step: '" + step + "'"); + } + + return step; + } + + public Long getStart() { + + if (start == null) { + start = getLong("start"); + } + + if (log.isDebugEnabled()) { + log.debug("start: '" + start + "'"); + } + + return start; + } + + public Long getEnd() { + + if (end == null) { + end = getLong("end"); + } + + if (log.isDebugEnabled()) { + log.debug("end: '" + end + "'"); + } + + return end; + } + + public Integer getQSectorStart() { + + if (qSectorStart == null) { + qSectorStart = getInteger("q1"); + } + + if (log.isDebugEnabled()) { + log.debug("q1: '" + qSectorStart + "'"); + } + + return qSectorStart; + } + + public Integer getQSectorEnd() { + + if (qSectorEnd == null) { + qSectorEnd = getInteger("q2"); + } + + if (log.isDebugEnabled()) { + log.debug("q2: '" + qSectorEnd + "'"); + } + + return qSectorEnd; + } + + public int [] getEvents() { + if (events == null) { + events = getIntArray("events"); + } + if (log.isDebugEnabled() && events != null) { + log.debug("events: " + Arrays.toString(events)); + } + return events; + } + + public DateRange getReferencePeriod() { + if (referencePeriod == null) { + StateData refStart = artifact.getData("ref_start"); + StateData refEnd = artifact.getData("ref_end"); + + if (refStart == null || refEnd == null) { + log.warn("missing 'ref_start' or 'ref_start' value"); + return null; + } + + try { + long rs = Long.parseLong((String)refStart.getValue()); + long re = Long.parseLong((String)refEnd .getValue()); + + if (rs > re) { long t = rs; rs = re; re = t; } + + Date from = new Date(rs); + Date to = new Date(re); + referencePeriod = new DateRange(from, to); + } + catch (NumberFormatException nfe) { + log.warn("ref_start or ref_end is not an integer."); + } + } + + return referencePeriod; + } + + public DateRange [] getAnalysisPeriods() { + if (analysisPeriods == null) { + analysisPeriods = getDateRange("ana_data"); + } + + return analysisPeriods; + } + + /** + * @return DateRange object ranging from eldest to youngest date + * of analysis and reference periods. + */ + public DateRange getDateRange() { + DateRange refP = getReferencePeriod(); + + Date from = refP.getFrom(); + Date to = refP.getTo(); + + DateRange[] rs = getAnalysisPeriods(); + for(DateRange r : rs) { + if(r.getFrom().before(from)) { + from = r.getFrom(); + } + if(r.getTo().after(to)) { + to = r.getTo(); + } + } + + return new DateRange(from, to); + } + + public Boolean getPreprocessing() { + if (preprocessing == null) { + preprocessing = getBoolean("preprocessing"); + } + if (log.isDebugEnabled()) { + log.debug("preprocessing: " + preprocessing); + } + return preprocessing; + } + + public String getFunction() { + if (function == null) { + function = getString("function"); + } + if (log.isDebugEnabled()) { + log.debug("function: " + function); + } + return function; + } + + public double [] getQs() { + if (qs == null) { + qs = getDoubleArray("qs"); + } + + if (log.isDebugEnabled() && qs != null) { + log.debug("qs: " + Arrays.toString(qs)); + } + return qs; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java Thu Jul 19 11:45:15 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,262 +0,0 @@ -package de.intevation.flys.artifacts.access; - -import de.intevation.artifactdatabase.data.StateData; -import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.model.DateRange; - -import java.util.Arrays; -import java.util.Date; - -import org.apache.log4j.Logger; - - -public class FixationArtifactAccess -extends Access -{ - private static Logger log = Logger.getLogger(FixationArtifactAccess.class); - - protected String river; - - protected String calculationMode; - - protected Double from; - protected Double to; - protected Double step; - - protected Long start; - protected Long end; - - protected Integer qSectorStart; - protected Integer qSectorEnd; - - protected DateRange referencePeriod; - protected DateRange [] analysisPeriods; - - protected int [] events; - - protected Boolean preprocessing; - - protected String function; - - protected double [] qs; - - public FixationArtifactAccess() { - } - - public FixationArtifactAccess(FLYSArtifact artifact) { - super(artifact); - } - - public String getRiver() { - if (river == null) { - river = getString("river"); - } - if (log.isDebugEnabled()) { - log.debug("river: '" + river + "'"); - } - return river; - } - - public String getCalculationMode() { - if (calculationMode == null) { - calculationMode = getString("calculation.mode"); - } - - if (log.isDebugEnabled()) { - log.debug("calculationMode: '" + calculationMode + "'"); - } - return calculationMode; - } - - public Double getFrom() { - - if (from == null) { - from = getDouble("from"); - } - - if (log.isDebugEnabled()) { - log.debug("from: '" + from + "'"); - } - - return from; - } - - public Double getTo() { - - if (to == null) { - to = getDouble("to"); - } - - if (log.isDebugEnabled()) { - log.debug("to: '" + to + "'"); - } - - return to; - } - - public Double getStep() { - - if (step == null) { - step = getDouble("step"); - } - - if (log.isDebugEnabled()) { - log.debug("step: '" + step + "'"); - } - - return step; - } - - public Long getStart() { - - if (start == null) { - start = getLong("start"); - } - - if (log.isDebugEnabled()) { - log.debug("start: '" + start + "'"); - } - - return start; - } - - public Long getEnd() { - - if (end == null) { - end = getLong("end"); - } - - if (log.isDebugEnabled()) { - log.debug("end: '" + end + "'"); - } - - return end; - } - - public Integer getQSectorStart() { - - if (qSectorStart == null) { - qSectorStart = getInteger("q1"); - } - - if (log.isDebugEnabled()) { - log.debug("q1: '" + qSectorStart + "'"); - } - - return qSectorStart; - } - - public Integer getQSectorEnd() { - - if (qSectorEnd == null) { - qSectorEnd = getInteger("q2"); - } - - if (log.isDebugEnabled()) { - log.debug("q2: '" + qSectorEnd + "'"); - } - - return qSectorEnd; - } - - public int [] getEvents() { - if (events == null) { - events = getIntArray("events"); - } - if (log.isDebugEnabled() && events != null) { - log.debug("events: " + Arrays.toString(events)); - } - return events; - } - - public DateRange getReferencePeriod() { - if (referencePeriod == null) { - StateData refStart = artifact.getData("ref_start"); - StateData refEnd = artifact.getData("ref_end"); - - if (refStart == null || refEnd == null) { - log.warn("missing 'ref_start' or 'ref_start' value"); - return null; - } - - try { - long rs = Long.parseLong((String)refStart.getValue()); - long re = Long.parseLong((String)refEnd .getValue()); - - if (rs > re) { long t = rs; rs = re; re = t; } - - Date from = new Date(rs); - Date to = new Date(re); - referencePeriod = new DateRange(from, to); - } - catch (NumberFormatException nfe) { - log.warn("ref_start or ref_end is not an integer."); - } - } - - return referencePeriod; - } - - public DateRange [] getAnalysisPeriods() { - if (analysisPeriods == null) { - analysisPeriods = getDateRange("ana_data"); - } - - return analysisPeriods; - } - - /** - * @return DateRange object ranging from eldest to youngest date - * of analysis and reference periods. - */ - public DateRange getDateRange() { - DateRange refP = getReferencePeriod(); - - Date from = refP.getFrom(); - Date to = refP.getTo(); - - DateRange[] rs = getAnalysisPeriods(); - for(DateRange r : rs) { - if(r.getFrom().before(from)) { - from = r.getFrom(); - } - if(r.getTo().after(to)) { - to = r.getTo(); - } - } - - return new DateRange(from, to); - } - - public Boolean getPreprocessing() { - if (preprocessing == null) { - preprocessing = getBoolean("preprocessing"); - } - if (log.isDebugEnabled()) { - log.debug("preprocessing: " + preprocessing); - } - return preprocessing; - } - - public String getFunction() { - if (function == null) { - function = getString("function"); - } - if (log.isDebugEnabled()) { - log.debug("function: " + function); - } - return function; - } - - public double [] getQs() { - if (qs == null) { - qs = getDoubleArray("qs"); - } - - if (log.isDebugEnabled() && qs != null) { - log.debug("qs: " + Arrays.toString(qs)); - } - return qs; - } -} -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -61,7 +61,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -62,7 +62,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAvSectorFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -60,7 +60,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Thu Jul 19 12:55:45 2012 +0000 @@ -1,6 +1,6 @@ package de.intevation.flys.artifacts.model.fixings; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.math.fitting.Function; import de.intevation.flys.artifacts.math.fitting.FunctionFactory; @@ -63,7 +63,7 @@ public FixCalculation() { } - public FixCalculation(FixationArtifactAccess access) { + public FixCalculation(FixAnalysisAccess access) { String river = access.getRiver(); Double from = access.getFrom(); diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDerivateFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.math.fitting.Function; import de.intevation.flys.artifacts.math.fitting.FunctionFactory; @@ -68,7 +68,7 @@ } FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixDeviationFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -4,7 +4,7 @@ import de.intevation.artifacts.CallContext; import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -59,7 +59,7 @@ logger.debug("FixDeviationFacet.getData"); if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalAnalysisFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -63,7 +63,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalDeviationFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -64,7 +64,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixLongitudinalReferenceFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -64,7 +64,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixOutlierFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -60,7 +60,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixReferenceEventsFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -62,7 +62,7 @@ if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixWQCurveFacet.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.math.fitting.Function; import de.intevation.flys.artifacts.math.fitting.FunctionFactory; @@ -61,7 +61,7 @@ logger.debug("FixWQCurveFacet.getData"); if (artifact instanceof FLYSArtifact) { FLYSArtifact flys = (FLYSArtifact)artifact; - FixationArtifactAccess access = new FixationArtifactAccess(flys); + FixAnalysisAccess access = new FixAnalysisAccess(flys); CalculationResult res = (CalculationResult) flys.compute(context, diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Thu Jul 19 12:55:45 2012 +0000 @@ -6,7 +6,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.CalculationResult; import de.intevation.flys.artifacts.model.DataFacet; @@ -89,8 +89,8 @@ CalculationResult res; - FixationArtifactAccess access = - new FixationArtifactAccess(artifact); + FixAnalysisAccess access = + new FixAnalysisAccess(artifact); if (old instanceof CalculationResult) { res = (CalculationResult)old; diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Jul 19 12:55:45 2012 +0000 @@ -5,7 +5,7 @@ import de.intevation.artifacts.CallContext; import de.intevation.artifacts.common.utils.XMLUtils; import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.DateRange; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.fixings.QWD; @@ -117,7 +117,7 @@ @Override protected String getDefaultChartSubtitle() { - FixationArtifactAccess access = new FixationArtifactAccess(artifact); + FixAnalysisAccess access = new FixAnalysisAccess(artifact); DateRange range = access.getDateRange(); return Resources.format( context.getMeta(), diff -r 70e9d56e21fc -r 50d61a2494cb flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Thu Jul 19 11:45:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Thu Jul 19 12:55:45 2012 +0000 @@ -2,7 +2,7 @@ import de.intevation.artifactdatabase.state.ArtifactAndFacet; import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixationArtifactAccess; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; import de.intevation.flys.artifacts.model.DateRange; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.fixings.FixFunction; @@ -213,7 +213,7 @@ @Override protected String getDefaultChartSubtitle() { - FixationArtifactAccess access = new FixationArtifactAccess(artifact); + FixAnalysisAccess access = new FixAnalysisAccess(artifact); DateRange range = access.getDateRange(); String subtitle = Resources.format( context.getMeta(),