Mercurial > dive4elements > river
changeset 4483:cc6323401643
Cosmetics: Removed some WSP, obsolete imports. Documentation added.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 13 Nov 2012 16:52:01 +0100 |
| parents | b5624ef2808f |
| children | 7e82d51c5a27 |
| files | flys-artifacts/src/main/java/de/intevation/flys/artifacts/FlowVelocityMeasurementArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoad.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadCalculation.java flys-backend/src/main/java/de/intevation/flys/model/DischargeZone.java flys-backend/src/main/java/de/intevation/flys/model/FlowVelocityMeasurement.java flys-client/src/main/java/de/intevation/flys/client/server/filter/NoCacheFilter.java |
| diffstat | 8 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FlowVelocityMeasurementArtifact.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FlowVelocityMeasurementArtifact.java Tue Nov 13 16:52:01 2012 +0100 @@ -14,7 +14,6 @@ import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.CallMeta; import de.intevation.artifacts.common.utils.XMLUtils; -import de.intevation.flys.model.FlowVelocityMeasurement; import de.intevation.flys.model.FlowVelocityMeasurementValue; import de.intevation.flys.artifacts.model.minfo.FlowVelocityMeasurementFacet; import de.intevation.flys.artifacts.model.minfo.FlowVelocityMeasurementFactory; @@ -111,7 +110,6 @@ Facet facet = new FlowVelocityMeasurementFacet( FLOW_VELOCITY_MEASUREMENT, "flowvelocity-name"); - fs.add(facet); facets.put(state.getID(), fs); addStringData(DATA_NAME, code);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Tue Nov 13 16:52:01 2012 +0100 @@ -16,8 +16,10 @@ import org.apache.log4j.Logger; +/** Calculate flow velocity. */ public class FlowVelocityCalculation extends Calculation { + /** Own logger. */ private static final Logger logger = Logger.getLogger(FlowVelocityCalculation.class);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java Tue Nov 13 16:52:01 2012 +0100 @@ -11,6 +11,7 @@ import org.apache.log4j.Logger; + /** * Facet of a FlowVelocity curve. */
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoad.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoad.java Tue Nov 13 16:52:01 2012 +0100 @@ -17,6 +17,7 @@ protected Date end; protected boolean isEpoch; + /** Maps kms. */ protected HashMap<Double, SedimentLoadFraction> kms; public SedimentLoad() { @@ -160,3 +161,4 @@ } } } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadCalculation.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadCalculation.java Tue Nov 13 16:52:01 2012 +0100 @@ -15,10 +15,12 @@ import de.intevation.flys.artifacts.model.CalculationResult; +/** Calculate sediment load. */ public class SedimentLoadCalculation extends Calculation { + /** Private logger. */ private static final Logger logger = Logger .getLogger(SedimentLoadCalculation.class); @@ -259,3 +261,4 @@ return load; } } +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-backend/src/main/java/de/intevation/flys/model/DischargeZone.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/model/DischargeZone.java Tue Nov 13 16:52:01 2012 +0100 @@ -29,7 +29,6 @@ { private static Logger logger = Logger.getLogger(DischargeZone.class); - private Integer id; private River river;
--- a/flys-backend/src/main/java/de/intevation/flys/model/FlowVelocityMeasurement.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/model/FlowVelocityMeasurement.java Tue Nov 13 16:52:01 2012 +0100 @@ -25,7 +25,6 @@ private static Logger logger = Logger.getLogger(FlowVelocityMeasurement.class); - private Integer id; private River river;
--- a/flys-client/src/main/java/de/intevation/flys/client/server/filter/NoCacheFilter.java Tue Nov 13 16:14:44 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/filter/NoCacheFilter.java Tue Nov 13 16:52:01 2012 +0100 @@ -1,7 +1,6 @@ package de.intevation.flys.client.server.filter; import java.io.IOException; -import java.util.Enumeration; import java.util.Date; import javax.servlet.Filter;