Mercurial > dive4elements > river
changeset 3232:cdbc457e23e2
Removed trailing whitespace.
flys-artifacts/trunk@4862 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 03 Jul 2012 12:52:58 +0000 |
| parents | f6b571220852 |
| children | 7e5460d08eb0 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/themes.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java |
| diffstat | 8 files changed, 60 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/ChangeLog Tue Jul 03 12:52:58 2012 +0000 @@ -1,3 +1,14 @@ +2012-07-03 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * doc/conf/themes.xml, + src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java, + src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java, + src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java, + src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java, + src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java, + src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java: + Removed trailing whitespace. + 2012-07-03 Ingo Weinzierl <ingo@intevation.de> * doc/conf/themes.xml: Added missing themes for middle bed height curves.
--- a/flys-artifacts/doc/conf/themes.xml Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/doc/conf/themes.xml Tue Jul 03 12:52:58 2012 +0000 @@ -898,7 +898,7 @@ <inherit from="HydrBoundariesPoly"/> </inherits> </theme> - + <!-- MIDDLE BED HEIGHT --> @@ -2070,7 +2070,7 @@ <inherit from="HydrBoundariesPoly"/> </inherits> </theme> - + <!-- MIDDLE BED HEIGHT -->
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/BedHeightAccess.java Tue Jul 03 12:52:58 2012 +0000 @@ -11,55 +11,55 @@ public class BedHeightAccess extends Access { private static final Logger logger = Logger.getLogger(BedHeightAccess.class); - - + + private int[] singleIDs; private int[] epochIDs; - + private Double lowerKM; private Double upperKM; - - + + public BedHeightAccess(FLYSArtifact artifact) { super(artifact); } - - + + public Double getLowerKM() { if (lowerKM == null) { lowerKM = getDouble("ld_from"); } - + return lowerKM; } - - + + public Double getUpperKM() { if (upperKM == null) { upperKM = getDouble("ld_to"); } - + return upperKM; } - - + + public int[] getBedHeightSingleIDs() { if (singleIDs == null) { String data = getString("soundings"); - + if (data == null) { logger.warn("No 'soundings' parameter specified!"); return null; } - + String[] parts = data.split(";"); - + TIntArrayList ids = new TIntArrayList(); - + for (String part: parts) { if (part.indexOf(SoundingsSelect.PREFIX_SINGLE) >= 0) { String tmp = part.replace(SoundingsSelect.PREFIX_SINGLE, ""); - + try { ids.add(Integer.parseInt(tmp)); } @@ -68,7 +68,7 @@ } } } - + singleIDs = ids.toNativeArray(); } @@ -79,20 +79,20 @@ public int[] getBedHeightEpochIDs() { if (epochIDs == null) { String data = getString("soundings"); - + if (data == null) { logger.warn("No 'soundings' parameter specified!"); return null; } - + String[] parts = data.split(";"); - + TIntArrayList ids = new TIntArrayList(); - + for (String part: parts) { if (part.indexOf(SoundingsSelect.PREFIX_EPOCH) >= 0) { String tmp = part.replace(SoundingsSelect.PREFIX_EPOCH, ""); - + try { ids.add(Integer.parseInt(tmp)); } @@ -101,10 +101,10 @@ } } } - + epochIDs = ids.toNativeArray(); } - + return epochIDs; } }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FlowVelocityAccess.java Tue Jul 03 12:52:58 2012 +0000 @@ -4,24 +4,24 @@ public class FlowVelocityAccess extends Access { - + private int[] mainChannels; private int[] totalChannels; - + private Double lowerKM; private Double upperKM; - - + + public FlowVelocityAccess(FLYSArtifact artifact) { super(artifact); } - - + + public int[] getMainChannels() { if (mainChannels == null) { mainChannels = getIntArray("main.channel"); } - + return mainChannels; } @@ -30,25 +30,25 @@ if (totalChannels == null) { totalChannels = getIntArray("total.channel"); } - + return totalChannels; } - - + + public Double getLowerKM() { if (lowerKM == null) { lowerKM = getDouble("ld_from"); } - + return lowerKM; } - - + + public Double getUpperKM() { if (upperKM == null) { upperKM = getDouble("ld_to"); } - + return upperKM; } }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java Tue Jul 03 12:52:58 2012 +0000 @@ -20,12 +20,12 @@ private static final Logger logger = Logger.getLogger(FlowVelocityCalculation.class); - - + + public CalculationResult calculate(FlowVelocityAccess access) { logger.info("FlowVelocityCalculation.calculate"); - + int[] mainIds = access.getMainChannels(); int[] totalIds = access.getTotalChannels();
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java Tue Jul 03 12:52:58 2012 +0000 @@ -29,11 +29,11 @@ int[] singleIds = access.getBedHeightSingleIDs(); int[] epochIds = access.getBedHeightEpochIDs(); - + if (logger.isDebugEnabled()) { Artifact artifact = access.getArtifact(); - + logger.debug("Artifact '" + artifact.identifier() + "' contains:"); if (singleIds != null) { logger.debug(" " + singleIds.length + " single bedheight ids");
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/FlowVelocityState.java Tue Jul 03 12:52:58 2012 +0000 @@ -46,7 +46,7 @@ logger.debug("FlowVelocityState.computeAdvance"); List<Facet> newFacets = new ArrayList<Facet>(); - + FlowVelocityAccess access = new FlowVelocityAccess(artifact); CalculationResult res = old instanceof CalculationResult
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java Tue Jul 03 12:34:15 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/MiddleBedHeight.java Tue Jul 03 12:52:58 2012 +0000 @@ -35,7 +35,7 @@ logger.debug("MiddleBedHeight.computeAdvance"); List<Facet> newFacets = new ArrayList<Facet>(); - + BedHeightAccess access = new BedHeightAccess(artifact); CalculationResult res = old instanceof CalculationResult