Mercurial > dive4elements > river
changeset 3418:21c1d1d25919
FixA: Moved common parameter access to common base class.
flys-artifacts/trunk@5071 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 19 Jul 2012 15:44:14 +0000 |
| parents | ed9689fbcd26 |
| children | da7cf0e3ccaa |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAccess.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java |
| diffstat | 4 files changed, 186 insertions(+), 167 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Jul 19 15:25:46 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Jul 19 15:44:14 2012 +0000 @@ -1,3 +1,12 @@ +2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/access/FixAccess.java: + New. Common base class for the Fix*Access. + + * src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java, + src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java: + Now inherit from FixAccess. + 2012-07-19 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/exports/fixings/ParametersExporter.java:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAccess.java Thu Jul 19 15:44:14 2012 +0000 @@ -0,0 +1,172 @@ +package de.intevation.flys.artifacts.access; + +import de.intevation.flys.artifacts.FLYSArtifact; + +import java.util.Arrays; + +import org.apache.log4j.Logger; + +public class FixAccess +extends Access +{ + private static Logger log = Logger.getLogger(FixAccess.class); + + protected String river; + + protected Double from; + protected Double to; + protected Double step; + + protected Long start; + protected Long end; + + protected Integer qSectorStart; + protected Integer qSectorEnd; + + protected int [] events; + + protected Boolean preprocessing; + + protected String function; + + public FixAccess() { + } + + public FixAccess(FLYSArtifact artifact) { + super(artifact); + } + + public String getRiver() { + if (river == null) { + river = getString("river"); + } + if (log.isDebugEnabled()) { + log.debug("river: '" + river + "'"); + } + return river; + } + + 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 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; + } + + +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java Thu Jul 19 15:25:46 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixAnalysisAccess.java Thu Jul 19 15:44:14 2012 +0000 @@ -12,33 +12,13 @@ import org.apache.log4j.Logger; public class FixAnalysisAccess -extends Access +extends FixAccess { 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() { @@ -48,128 +28,6 @@ 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"); @@ -217,11 +75,11 @@ Date to = refP.getTo(); DateRange[] rs = getAnalysisPeriods(); - for(DateRange r : rs) { - if(r.getFrom().before(from)) { + for (DateRange r: rs) { + if (r.getFrom().before(from)) { from = r.getFrom(); } - if(r.getTo().after(to)) { + if (r.getTo().after(to)) { to = r.getTo(); } } @@ -229,26 +87,6 @@ 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");
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java Thu Jul 19 15:25:46 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java Thu Jul 19 15:44:14 2012 +0000 @@ -5,7 +5,7 @@ import org.apache.log4j.Logger; public class FixRealizingAccess -extends Access +extends FixAccess { private static Logger log = Logger.getLogger(FixRealizingAccess.class);