# HG changeset patch # User Sascha L. Teichmann # Date 1339752607 0 # Node ID 5642a83420f2f3a0b0d7472895185e53cec14971 # Parent db9e2bb347075e9ea85db6bd0df9ed90340c8ad8 FLYS artifacts: Removed trailing whitespace. flys-artifacts/trunk@4670 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/ChangeLog Fri Jun 15 09:30:07 2012 +0000 @@ -1,3 +1,7 @@ +2012-06-15 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/**/*.java: Removed trailing whitespace. + 2012-06-14 Sascha L. Teichmann * doc/conf/conf.xml: Added out commented block for SedDB configuration. diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -65,7 +65,7 @@ public double[] getDistance() { /** TODO In initialize(), access maximal range of river (via - * AnnotationFactory) instead of overriding getDistance, + * AnnotationFactory) instead of overriding getDistance, * important for diagram generation. */ return new double[] {0f, 1000f}; } @@ -208,6 +208,6 @@ catch (IllegalArgumentException iae) { // state is not valid, so we do not append its outputs. } - } + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -100,12 +100,12 @@ DefaultState state = (DefaultState) getCurrentState(context); state.computeInit(this, hash(), context, meta, fs); - if (!fs.isEmpty()) { + if (!fs.isEmpty()) { logger.debug("Facets to add in GaugeDischargeArtifact.initialize. (" - + state.getID() + "/ " + getCurrentStateId() + ")."); - facets.put(getCurrentStateId(), fs); - } - else { + + state.getID() + "/ " + getCurrentStateId() + ")."); + facets.put(getCurrentStateId(), fs); + } + else { logger.debug("No facets to add in GaugeDischargeArtifact.initialize (" + state.getID() + "/ "+getCurrentStateId()+")."); } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/HYKArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/HYKArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/HYKArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -106,11 +106,11 @@ DefaultState state = (DefaultState) getCurrentState(context); state.computeInit(this, hash(), context, callMeta, fs); - if (!fs.isEmpty()) { - logger.debug("Facets to add in HYKArtifact.initialize ."); - facets.put(getCurrentStateId(), fs); - } - else { + if (!fs.isEmpty()) { + logger.debug("Facets to add in HYKArtifact.initialize ."); + facets.put(getCurrentStateId(), fs); + } + else { logger.debug("No facets to add in HYKArtifact.initialize (" + state.getID() + ")."); } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -298,7 +298,7 @@ if (mv.getMainValue().getType().getName().equals("W")) { filteredList.add(new NamedDouble(mv.getMainValue().getName(), mv.getValue().doubleValue())); - + } } else // We cannot interpolate the W values, so derive them diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/ManualPointsArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -78,11 +78,11 @@ DefaultState state = (DefaultState) getCurrentState(context); state.computeInit(this, hash(), context, meta, fs); - if (!fs.isEmpty()) { - logger.debug("Facets to add in ManualPointsArtifact.initialize ."); - facets.put(getCurrentStateId(), fs); - } - else { + if (!fs.isEmpty()) { + logger.debug("Facets to add in ManualPointsArtifact.initialize ."); + facets.put(getCurrentStateId(), fs); + } + else { logger.debug("No facets to add in ManualPointsArtifact.initialize (" + state.getID() + ")."); } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticFLYSArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -62,7 +62,7 @@ ui.appendChild(staticE); staticE.appendChild(state); root.appendChild(ui); - + for (StateData dataItem : datas) { Element itemelent = creator.create("data"); creator.addAttr(itemelent, "name", dataItem.getName(), true); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/StaticWQKmsArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -105,11 +105,11 @@ DefaultState state = (DefaultState) getCurrentState(context); state.computeInit(this, hash(), context, meta, fs); - if (!fs.isEmpty()) { - logger.debug("Facets to add in StaticWQKmsArtifact.initialize ."); - facets.put(getCurrentStateId(), fs); - } - else { + if (!fs.isEmpty()) { + logger.debug("Facets to add in StaticWQKmsArtifact.initialize ."); + facets.put(getCurrentStateId(), fs); + } + else { logger.debug("No facets to add in StaticWQKmsArtifact.initialize (" + state.getID() + ")."); } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -348,7 +348,7 @@ } qs = qws[0]; - if (reportGeneratedWs(report, qws[1])) { + if (reportGeneratedWs(report, qws[1])) { ws = qws[1]; } } @@ -838,8 +838,8 @@ logger.debug("getQsForWs: number of Qs: " + outQs.size()); } - return new double [][] { - outQs.toNativeArray(), + return new double [][] { + outQs.toNativeArray(), generatedWs ? outWs.toNativeArray() : null }; } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java Fri Jun 15 09:30:07 2012 +0000 @@ -75,11 +75,11 @@ List fs = new ArrayList(); DefaultState state = (DefaultState) getCurrentState(context); state.computeInit(this, hash(), context, meta, fs); - if (!fs.isEmpty()) { - logger.debug("Facets to add in WaterlevelArtifact.initialize ."); - facets.put(getCurrentStateId(), fs); - } - else { + if (!fs.isEmpty()) { + logger.debug("Facets to add in WaterlevelArtifact.initialize ."); + facets.put(getCurrentStateId(), fs); + } + else { logger.debug("No facets to add in WaterlevelArtifact.initialize (" + state.getID() + ")."); } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java Fri Jun 15 09:30:07 2012 +0000 @@ -128,7 +128,7 @@ @Override public int getColumnCount() { - return 5; + return 5; } @Override @@ -152,7 +152,7 @@ @Override public void setValueAt(Object value, int row, int col) { switch (col) { - case 1: + case 1: if (change(drawCrossSection, row, (Boolean)value)) { fireTableCellUpdated(row, col); } @@ -181,7 +181,7 @@ case 0: return String.class; case 1: case 2: - case 3: + case 3: case 4: return Boolean.class; } return null; @@ -198,7 +198,7 @@ private static boolean change( boolean [] values, - int index, + int index, boolean value ) { if (values[index] != value) { @@ -214,7 +214,7 @@ List> lines; public CrossSectionLineItem( - Double km, + Double km, List> lines ) { this.km = km; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/DBConfig.java Fri Jun 15 09:30:07 2012 +0000 @@ -8,7 +8,7 @@ import org.apache.log4j.Logger; public class DBConfig -{ +{ private static Logger logger = Logger.getLogger(DBConfig.class); /** diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Datacage.java Fri Jun 15 09:30:07 2012 +0000 @@ -84,7 +84,7 @@ protected SQLExecutor sqlExecutor; - public class InitialScan + public class InitialScan implements ArtifactDatabase.ArtifactLoadedCallback { protected LRUCache users; @@ -402,10 +402,10 @@ } protected static final void setString( - PreparedStatement stmnt, + PreparedStatement stmnt, int index, Object value - ) + ) throws SQLException { if (value == null) { @@ -482,7 +482,7 @@ } public void createdArtifact( - Artifact artifact, + Artifact artifact, Backend backend, GlobalContext context ) { diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/Recommendations.java Fri Jun 15 09:30:07 2012 +0000 @@ -115,7 +115,7 @@ } protected static void artifactToParameters( - FLYSArtifact artifact, + FLYSArtifact artifact, Map parameters ) { parameters.put("CURRENT-STATE-ID", artifact.getCurrentStateId()); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/Builder.java Fri Jun 15 09:30:07 2012 +0000 @@ -64,14 +64,14 @@ } public NamedConnection( - String name, + String name, Connection connection ) { this(name, connection, true); } public NamedConnection( - String name, + String name, Connection connection, boolean cached ) { @@ -209,7 +209,7 @@ /** * Kind of foreach over results of a statement within a context. */ - protected void elements(Node parent, Element current) + protected void elements(Node parent, Element current) throws SQLException { log.debug("dc:elements"); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/datacage/templating/CompiledStatement.java Fri Jun 15 09:30:07 2012 +0000 @@ -107,7 +107,7 @@ protected ResultData executeUncached( Connection connection, StackFrames frames - ) + ) throws SQLException { log.debug("executeUncached"); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/Polygon2D.java Fri Jun 15 09:30:07 2012 +0000 @@ -251,7 +251,7 @@ while (ai < as.length && bi < bs.length) { double xan = X(as[ai]); double xbn = X(bs[bi]); - if (xan == xbn) { + if (xan == xbn) { double yan = Y(as[ai]); double ybn = Y(bs[ai]); @@ -305,9 +305,9 @@ else if (xan > xbn) { line.set(apoints.get(apoints.size()-1), as[ai]); double dir = neg ? -1d: 1d; // XXX: correct sign? - while (bi < bs.length + while (bi < bs.length && X(bs[bi]) < xan - && line.eval(bs[bi])*dir > EPSILON) + && line.eval(bs[bi])*dir > EPSILON) ++bi; if (bi == bs.length) { // b run out of points @@ -353,7 +353,7 @@ } public void set(Point2D p1, Point2D p2) { - Point2D p3 = + Point2D p3 = VectorUtils.normalize( VectorUtils.sub(p1, p2)); @@ -415,7 +415,7 @@ // Sort out the ranges that are not intersecting // the ranges in the other series. // We are going to merge them anyway - // so this is not strictly required. + // so this is not strictly required. // Keep it to recude cases. if (removeNoneIntersecting(splAs, splBs) || removeNoneIntersecting(splBs, splAs) diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/geom/VectorUtils.java Fri Jun 15 09:30:07 2012 +0000 @@ -54,7 +54,7 @@ public static final Point2D normalize(Point2D a) { double length = length(a); return length != 0d - ? scale(a, 1d/length) + ? scale(a, 1d/length) : new Point2D.Double(X(a), Y(a)); } @@ -74,7 +74,7 @@ } public static boolean epsilonEquals(Point2D a, Point2D b) { - return Math.abs(X(a)-X(b)) < EPSILON + return Math.abs(X(a)-X(b)) < EPSILON && Math.abs(Y(a)-Y(b)) < EPSILON; } @@ -146,4 +146,4 @@ } } -// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/BackJumpCorrector.java Fri Jun 15 09:30:07 2012 +0000 @@ -188,8 +188,8 @@ protected static double aboveWaterKM( - double [] km, - double [] ws, + double [] km, + double [] ws, int wIndex ) { double w = ws[wIndex]; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/DifferenceCurveFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -50,7 +50,7 @@ WKms [] wkms = (WKms [])res.getData(); WKms result = wkms[index]; - logger.debug("Got difference curve data (" + result.getName() + logger.debug("Got difference curve data (" + result.getName() + ") at index: " + index); return result; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/LinearFilterFunction.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/LinearFilterFunction.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/LinearFilterFunction.java Fri Jun 15 09:30:07 2012 +0000 @@ -1,6 +1,6 @@ package de.intevation.flys.artifacts.math; -public class LinearFilterFunction +public class LinearFilterFunction extends FilterFunction { protected double m; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/LinearFunction.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/LinearFunction.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/LinearFunction.java Fri Jun 15 09:30:07 2012 +0000 @@ -1,6 +1,6 @@ package de.intevation.flys.artifacts.math; -public class LinearFunction +public class LinearFunction implements Function { protected double m; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/WKmsOperation.java Fri Jun 15 09:30:07 2012 +0000 @@ -9,7 +9,7 @@ { public static final double EPSILON = 1e-6; - public static final class KmW + public static final class KmW implements Comparable { protected double km; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/fitting/App.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/fitting/App.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/math/fitting/App.java Fri Jun 15 09:30:07 2012 +0000 @@ -35,7 +35,7 @@ } }; - public static final ListreadPoints(Reader reader) + public static final ListreadPoints(Reader reader) throws IOException { Map map = new TreeMap(EPS_CMP); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AreaFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -62,13 +62,13 @@ List providers = context. getDataProvider(artifact.getLowerDPKey()); if (providers.size() < 1) { - logger.warn("No 'lower' provider given for area [" + + logger.warn("No 'lower' provider given for area [" + artifact.getLowerDPKey() + "]"); } else { lowerData = providers.get(0).provideData( artifact.getLowerDPKey(), null, context); - logger.debug("'Lower' data provider key for area [" + + logger.debug("'Lower' data provider key for area [" + artifact.getLowerDPKey() + "]"); stemFacetName = artifact.getLowerDPKey().split(":")[1]; } @@ -98,7 +98,7 @@ /** Do a deep copy. */ - @Override + @Override public Facet deepCopy() { AreaFacet copy = new AreaFacet(this.index, this.name, this.description); copy.set(this); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation5.java Fri Jun 15 09:30:07 2012 +0000 @@ -29,7 +29,7 @@ } public CalculationResult calculate( - WstValueTable wst, + WstValueTable wst, Map kms2gaugeDatums, CallContext context ) { @@ -66,11 +66,11 @@ protected static String generateName( CallMeta meta, - double startKm, + double startKm, double endKm ) { NumberFormat nf = Formatter.getCalculationKm(meta); - return "W(km " + nf.format(startKm) + + return "W(km " + nf.format(startKm) + ") ~ W(km " + nf.format(endKm) + ")"; } } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -97,7 +97,7 @@ /** Do a deep copy. */ - @Override + @Override public Facet deepCopy() { CrossSectionFacet copy = new CrossSectionFacet(this.index, this.description); copy.set(this); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/CrossSectionWaterLineFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -44,7 +44,7 @@ logger.warn("Could not find Cross-Section data provider."); return new Lines.LineData(new double[][] {}, 0d, 0d); } - + Object crossSection = providers.get(0) .provideData(CrossSectionFacet.BLACKBOARD_CS_MASTER_DATA, null, context); @@ -61,7 +61,7 @@ /** Do a deep copy. */ - @Override + @Override public Facet deepCopy() { CrossSectionWaterLineFacet copy = new CrossSectionWaterLineFacet( this.getIndex(), diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DurationCurveFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -88,7 +88,7 @@ /** Create a deep copy. */ - @Override + @Override public Facet deepCopy() { DurationCurveFacet copy = new DurationCurveFacet(); copy.set(this); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FastCrossSectionChunk.java Fri Jun 15 09:30:07 2012 +0000 @@ -40,7 +40,7 @@ long stopTime = System.currentTimeMillis(); if (log.isDebugEnabled()) { - log.debug("Fetching cross section lines took " + + log.debug("Fetching cross section lines took " + (float)(stopTime-startTime)/1000f + " secs."); } } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FixingsOverview.java Fri Jun 15 09:30:07 2012 +0000 @@ -202,7 +202,7 @@ protected Double getMainValue(String label) { Double v = mainValues.get(label); if (v == null) { - log.warn("Missing main value '" + log.warn("Missing main value '" + label + "' for gauge " + gaugeId); } return v; @@ -399,7 +399,7 @@ this.columnId = columnId; this.startTime = startTime; this.name = name; - + sectors = new ArrayList(); } @@ -568,8 +568,8 @@ Filter filter ) { for (Column column: columns) { - if ((range == null || column.intersects(range)) - && (filter == null || filter.accept(column))) { + if ((range == null || column.intersects(range)) + && (filter == null || filter.accept(column))) { allColumns.add(column); } } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/HYKFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -50,7 +50,7 @@ logger.warn("Could not find Cross-Section data provider to get master cs km."); return null; } - + FastCrossSectionLine crossSection = (FastCrossSectionLine) providers.get(0) .provideData(dataKey, null, context); @@ -66,7 +66,7 @@ /** Do a deep copy. */ - @Override + @Override public Facet deepCopy() { HYKFacet copy = new HYKFacet(this.index, this.description); copy.set(this); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ManagedDomFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -9,7 +9,7 @@ import de.intevation.artifacts.ArtifactNamespaceContext; -/** +/** * Use an Element (DOM) to store the information about a facet. * The intent of this facet type is to represent a facet * stored in an Collection attribute. Different facets can have different diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ManagedFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -123,7 +123,7 @@ active = other.active; } - @Override + @Override public Facet deepCopy() { ManagedFacet copy = new ManagedFacet(); copy.set((DefaultFacet)this); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Parameters.java Fri Jun 15 09:30:07 2012 +0000 @@ -171,15 +171,15 @@ public double [] interpolate( String columnName, - double key, + double key, double [] values ) { return interpolate(columnIndex(columnName), key, values); } public double [] interpolate( - int columnIndex, - double key, + int columnIndex, + double key, double [] values ) { int row = binarySearch(columnIndex, key, EPSILON); @@ -209,8 +209,8 @@ public double [] interpolate( - String keyName, - double key, + String keyName, + double key, String [] columnNames ) { int keyIndex = columnIndex(keyName); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/QRangeTree.java Fri Jun 15 09:30:07 2012 +0000 @@ -138,7 +138,7 @@ public QRangeTree( List qRanges, - AccessQAB accessQAB, + AccessQAB accessQAB, int start, int stop ) { diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/ReferenceCurveFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -18,7 +18,7 @@ /** Facet for W-over-Ws. */ -public class ReferenceCurveFacet +public class ReferenceCurveFacet extends DataFacet { private static Logger log = Logger.getLogger(ReferenceCurveFacet.class); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsFactory.java Fri Jun 15 09:30:07 2012 +0000 @@ -20,7 +20,7 @@ import de.intevation.flys.backend.SessionHolder; /** - * Factory to access ready-made WKms for other (than computed) 'kinds' of + * Factory to access ready-made WKms for other (than computed) 'kinds' of * WST-data. */ public class WKmsFactory diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQCKms.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQCKms.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQCKms.java Fri Jun 15 09:30:07 2012 +0000 @@ -8,7 +8,7 @@ * * @author Ingo Weinzierl */ -public class WQCKms +public class WQCKms extends WQKms { protected TDoubleArrayList cws; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQKmsFactory.java Fri Jun 15 09:30:07 2012 +0000 @@ -19,7 +19,7 @@ import de.intevation.flys.backend.SessionHolder; /** - * Factory to access ready-made WQKms for other (than computed) 'kinds' of + * Factory to access ready-made WQKms for other (than computed) 'kinds' of * WST-data. */ public class WQKmsFactory diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WW.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WW.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WW.java Fri Jun 15 09:30:07 2012 +0000 @@ -20,7 +20,7 @@ } public ApplyFunctionIterator( - WW ww, + WW ww, Function function1, Function function2 ) { @@ -81,10 +81,10 @@ } public WW( - String name, + String name, double startKm, Double startDatum, - double [] ws, + double [] ws, double endKm, Double endDatum, double [] ws2 diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWQQ.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWQQ.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWQQ.java Fri Jun 15 09:30:07 2012 +0000 @@ -44,7 +44,7 @@ } public WWQQ( - String name, + String name, double startKm, Double startDatum, double [] ws1, diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java Fri Jun 15 09:30:07 2012 +0000 @@ -100,7 +100,7 @@ public SplineFunction( PolynomialSplineFunction spline, - double [] splineQs, + double [] splineQs, double [] splineWs ) { this.spline = spline; @@ -109,8 +109,8 @@ } public double [][] sample( - int numSamples, - double km, + int numSamples, + double km, Calculation errors ) { double minQ = getQMin(); @@ -446,7 +446,7 @@ public double [] findQsForW( Row other, double w, - double km, + double km, WstValueTable table ) { TDoubleArrayList qs = new TDoubleArrayList(); @@ -1035,7 +1035,7 @@ /** 'Bezugslinienverfahren' */ public double [][] relateWs( - double km1, + double km1, double km2, Calculation errors ) { @@ -1061,11 +1061,11 @@ /* TODO: Add optimized methods of relateWs to relate one - * start km to many end kms. The index generation/spline stuff for + * start km to many end kms. The index generation/spline stuff for * the start km is always the same. */ public double [][] relateWs( - double km1, + double km1, double km2, int numSamples, Calculation errors @@ -1156,7 +1156,7 @@ return new double [][] { ws1.toNativeArray(), - qs1.toNativeArray(), + qs1.toNativeArray(), ws2.toNativeArray(), qs2.toNativeArray() }; } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTableFactory.java Fri Jun 15 09:30:07 2012 +0000 @@ -96,7 +96,7 @@ Session session = SessionHolder.HOLDER.get(); // Fetch data for one column only. - + WstValueTable.Column [] columns = loadColumns(session, wst_id); loadQRanges(session, columns, wst_id); List rows = loadRows(session, wst_id, columns.length); @@ -138,7 +138,7 @@ Session session = SessionHolder.HOLDER.get(); // Fetch data for one column only. - + WstValueTable.Column [] columns = loadColumn(session, wst_id, col_pos); loadQRanges(session, columns, wst_id, col_pos); List rows = loadRowsOneColumn(session, wst_id, col_pos); @@ -452,7 +452,7 @@ } } */ - + } protected static void loadQRanges( diff -r db9e2bb34707 -r 5642a83420f2 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 Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisEventsFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -73,7 +73,7 @@ double km = access.getCurrentKm(); KMIndex kmPeriods = result.getAnalysisPeriods(); - KMIndex.Entry kmPeriodsEntry = + KMIndex.Entry kmPeriodsEntry = kmPeriods.binarySearch(km); if(kmPeriodsEntry == null) { diff -r db9e2bb34707 -r 5642a83420f2 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 Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixAnalysisPeriodsFacet.java Fri Jun 15 09:30:07 2012 +0000 @@ -73,7 +73,7 @@ double km = access.getCurrentKm(); KMIndex kmPeriods = result.getAnalysisPeriods(); - KMIndex.Entry kmPeriodsEntry = + KMIndex.Entry kmPeriodsEntry = kmPeriods.binarySearch(km); if (kmPeriodsEntry == null) { diff -r db9e2bb34707 -r 5642a83420f2 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 Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java Fri Jun 15 09:30:07 2012 +0000 @@ -265,7 +265,7 @@ analysisPeriods.sort(); FixResult fr = new FixResult( - results, + results, referenced, outliers, analysisPeriods); @@ -317,7 +317,7 @@ double [] wq = new double[2]; - int [] parameterIndices = + int [] parameterIndices = parameters.columnIndices(function.getParameterNames()); double [] parameterValues = new double[parameterIndices.length]; @@ -450,7 +450,7 @@ return results; } - /** Helper class to bundle the meta information of a column + /** Helper class to bundle the meta information of a column * and the real data. */ protected static class Column { @@ -475,8 +475,8 @@ } public boolean getQW( - double km, - double [] qs, + double km, + double [] qs, double [] ws, int index ) { diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/CacheInvalidationService.java Fri Jun 15 09:30:07 2012 +0000 @@ -15,7 +15,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; -public class CacheInvalidationService +public class CacheInvalidationService extends XMLService { @Override diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/FixingsKMChartService.java Fri Jun 15 09:30:07 2012 +0000 @@ -62,40 +62,40 @@ // TODO: Load fancy image from resources. public static final byte [] EMPTY = { - (byte)0x89, (byte)0x50, (byte)0x4e, (byte)0x47, - (byte)0x0d, (byte)0x0a, (byte)0x1a, (byte)0x0a, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x0d, - (byte)0x49, (byte)0x48, (byte)0x44, (byte)0x52, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x01, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x01, - (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x3a, (byte)0x7e, (byte)0x9b, - (byte)0x55, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x01, (byte)0x73, (byte)0x52, (byte)0x47, - (byte)0x42, (byte)0x00, (byte)0xae, (byte)0xce, - (byte)0x1c, (byte)0xe9, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x09, (byte)0x70, (byte)0x48, - (byte)0x59, (byte)0x73, (byte)0x00, (byte)0x00, - (byte)0x0b, (byte)0x13, (byte)0x00, (byte)0x00, - (byte)0x0b, (byte)0x13, (byte)0x01, (byte)0x00, - (byte)0x9a, (byte)0x9c, (byte)0x18, (byte)0x00, - (byte)0x00, (byte)0x00, (byte)0x07, (byte)0x74, - (byte)0x49, (byte)0x4d, (byte)0x45, (byte)0x07, - (byte)0xdc, (byte)0x04, (byte)0x04, (byte)0x10, - (byte)0x30, (byte)0x15, (byte)0x7d, (byte)0x77, - (byte)0x36, (byte)0x0b, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x08, (byte)0x74, (byte)0x45, - (byte)0x58, (byte)0x74, (byte)0x43, (byte)0x6f, - (byte)0x6d, (byte)0x6d, (byte)0x65, (byte)0x6e, - (byte)0x74, (byte)0x00, (byte)0xf6, (byte)0xcc, - (byte)0x96, (byte)0xbf, (byte)0x00, (byte)0x00, - (byte)0x00, (byte)0x0a, (byte)0x49, (byte)0x44, - (byte)0x41, (byte)0x54, (byte)0x08, (byte)0xd7, - (byte)0x63, (byte)0xf8, (byte)0x0f, (byte)0x00, - (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x00, - (byte)0x1b, (byte)0xb6, (byte)0xee, (byte)0x56, - (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, - (byte)0x49, (byte)0x45, (byte)0x4e, (byte)0x44, + (byte)0x89, (byte)0x50, (byte)0x4e, (byte)0x47, + (byte)0x0d, (byte)0x0a, (byte)0x1a, (byte)0x0a, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x0d, + (byte)0x49, (byte)0x48, (byte)0x44, (byte)0x52, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x01, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x01, + (byte)0x08, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x3a, (byte)0x7e, (byte)0x9b, + (byte)0x55, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x01, (byte)0x73, (byte)0x52, (byte)0x47, + (byte)0x42, (byte)0x00, (byte)0xae, (byte)0xce, + (byte)0x1c, (byte)0xe9, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x09, (byte)0x70, (byte)0x48, + (byte)0x59, (byte)0x73, (byte)0x00, (byte)0x00, + (byte)0x0b, (byte)0x13, (byte)0x00, (byte)0x00, + (byte)0x0b, (byte)0x13, (byte)0x01, (byte)0x00, + (byte)0x9a, (byte)0x9c, (byte)0x18, (byte)0x00, + (byte)0x00, (byte)0x00, (byte)0x07, (byte)0x74, + (byte)0x49, (byte)0x4d, (byte)0x45, (byte)0x07, + (byte)0xdc, (byte)0x04, (byte)0x04, (byte)0x10, + (byte)0x30, (byte)0x15, (byte)0x7d, (byte)0x77, + (byte)0x36, (byte)0x0b, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x08, (byte)0x74, (byte)0x45, + (byte)0x58, (byte)0x74, (byte)0x43, (byte)0x6f, + (byte)0x6d, (byte)0x6d, (byte)0x65, (byte)0x6e, + (byte)0x74, (byte)0x00, (byte)0xf6, (byte)0xcc, + (byte)0x96, (byte)0xbf, (byte)0x00, (byte)0x00, + (byte)0x00, (byte)0x0a, (byte)0x49, (byte)0x44, + (byte)0x41, (byte)0x54, (byte)0x08, (byte)0xd7, + (byte)0x63, (byte)0xf8, (byte)0x0f, (byte)0x00, + (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x00, + (byte)0x1b, (byte)0xb6, (byte)0xee, (byte)0x56, + (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, + (byte)0x49, (byte)0x45, (byte)0x4e, (byte)0x44, (byte)0xae, (byte)0x42, (byte)0x60, (byte)0x82 }; @@ -167,7 +167,7 @@ protected static Output encode( JFreeChart chart, - Dimension extent, + Dimension extent, String format ) { BufferedImage image = chart.createBufferedImage( diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MapInfoService.java Fri Jun 15 09:30:07 2012 +0000 @@ -59,7 +59,7 @@ } protected static String getStringXPath( - String query, + String query, Map variables ) { return (String)XMLUtils.xpath( @@ -68,7 +68,7 @@ } protected static Node getNodeXPath( - String query, + String query, Map variables ) { return (Node)XMLUtils.xpath( diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/services/MetaDataService.java Fri Jun 15 09:30:07 2012 +0000 @@ -158,7 +158,7 @@ String [] outs = outsString == null ? new String [0] : outsString.split("\\s*,\\s*"); - + Recommendations rec = Recommendations.getInstance(); rec.recommend( flysArtifact, userId, outs, data, result); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/EnterMultipleLocationsState.java Fri Jun 15 09:30:07 2012 +0000 @@ -14,7 +14,7 @@ return "multi_location_panel"; } - + /** Deal with multiple double values. */ @Override protected String getLabelFor( diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/ManualPointsSingleState.java Fri Jun 15 09:30:07 2012 +0000 @@ -61,7 +61,7 @@ 0, fName, Resources.getMsg(meta, "manualpoints", "Manual Points")); - + facets.add(facet); } else { diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java Fri Jun 15 09:30:07 2012 +0000 @@ -84,7 +84,7 @@ logger.error("No WKms from artifact."); return wkms; } - + WINFOArtifact flys = (WINFOArtifact) FLYSUtils.getArtifact( uuid, context); @@ -156,7 +156,7 @@ String facetName = "diff ()"; if (minuendWKms != null && subtrahendWKms != null) { - facetName = StringUtil.wWrap(minuendWKms.getName()) + facetName = StringUtil.wWrap(minuendWKms.getName()) + " - " + StringUtil.wWrap(subtrahendWKms.getName()); WKms wkms = WKmsOperation.SUBTRACTION.operate(minuendWKms, subtrahendWKms); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelPairSelectState.java Fri Jun 15 09:30:07 2012 +0000 @@ -124,7 +124,7 @@ /** * Get name to display for selected watelerlevels (for example "Q=123") - * from the CalculationResult. + * from the CalculationResult. */ public static String[] getLabels(CallContext cc, String value) { String[] recommendations = value.split("#"); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WaterlevelSelectState.java Fri Jun 15 09:30:07 2012 +0000 @@ -109,7 +109,7 @@ /** * Get name to display for selected watelerlevel (for example "Q=123") - * from the CalculationResult. + * from the CalculationResult. */ public static String[] getLabels(CallContext cc, String value) { String[] parts = value.split(SPLIT_CHAR); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -241,7 +241,7 @@ NumberFormat nf = nf = Formatter.getMeterFormat(this.context); series.setLabel(series.getLabel() + ",H=" + nf.format(lines.area / lines.width) + "m"); - // : " + lines.area + "/" + lines.width); + // : " + lines.area + "/" + lines.width); } StyledSeriesBuilder.addPoints(series, lines.points, false); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -178,7 +178,7 @@ /** - * Gets key to look up internationalized String for the charts short + * Gets key to look up internationalized String for the charts short * subtitle. * @return key to look up translated subtitle. */ diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java Fri Jun 15 09:30:07 2012 +0000 @@ -83,7 +83,7 @@ protected boolean endAtGauge = false; - + @Override public void init(Document request, OutputStream out, CallContext context) { logger.debug("ReferenceCurveExporter.init"); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -183,7 +183,7 @@ artifactFacet, theme, visible); - + } else { logger.warn("Unknown facet name: " + name); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/StyledSeriesBuilder.java Fri Jun 15 09:30:07 2012 +0000 @@ -4,9 +4,9 @@ import org.jfree.data.xy.XYSeries; -import de.intevation.flys.artifacts.model.WKms; -import de.intevation.flys.artifacts.model.WQKms; -import de.intevation.flys.artifacts.model.WWQQ; +import de.intevation.flys.artifacts.model.WKms; +import de.intevation.flys.artifacts.model.WQKms; +import de.intevation.flys.artifacts.model.WWQQ; /** * Helper to create and modify StyledXYSeries. diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -101,7 +101,7 @@ /** - * + * */ @Override public JFreeChart generateChart() { diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -194,7 +194,7 @@ protected List annotations; protected List domainMarkers = new ArrayList(); - + /** The max X range to include all X values of all series for each axis. */ protected Map xBounds; @@ -361,7 +361,7 @@ } } - + /** * Add the given vertical marker to the chart. */ @@ -960,7 +960,7 @@ XYLineAnnotation lineBackAnnotation = createStickyLineAnnotation( StickyAxisAnnotation.SimpleAxis.X_AXIS, - annotation.getHitPoint(), annotation.getPos(), + annotation.getHitPoint(), annotation.getPos(), area, lineStyle); plot.getRenderer(rendererIndex).addAnnotation(lineBackAnnotation, org.jfree.ui.Layer.BACKGROUND); @@ -1226,7 +1226,7 @@ catch(JSONException e){ logger.error("Could not decode json."); } - + FLYSAnnotation annotations = new FLYSAnnotation(null, null, null, theme); annotations.setTextAnnotations(xy); @@ -1250,7 +1250,7 @@ // getLinePaint() // getLineStroke() // getOutlinePaint() - // getOutlineStroke() + // getOutlineStroke() // Shape getShape() // String getToolTipText() // String getURLText() diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDerivedCurveGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -24,26 +24,26 @@ * * @author Christian Lins */ -public class FixDerivedCurveGenerator +public class FixDerivedCurveGenerator extends XYChartGenerator implements FacetTypes { - private static Logger logger = + private static Logger logger = Logger.getLogger(FixDerivedCurveGenerator.class); public static final String I18N_CHART_TITLE = "chart.fixings.derived.title"; - public static final String I18N_CHART_SUBTITLE = + public static final String I18N_CHART_SUBTITLE = "chart.fixings.derived.subtitle"; public static final String I18N_XAXIS_LABEL = "chart.fixings.derived.xaxis.label"; - public static final String I18N_YAXIS_LABEL = + public static final String I18N_YAXIS_LABEL = "chart.fixings.derived.yaxis.label"; - public static final String I18N_CHART_TITLE_DEFAULT = + public static final String I18N_CHART_TITLE_DEFAULT = "Ableitungskurve"; public static final String I18N_XAXIS_LABEL_DEFAULT = @@ -58,7 +58,7 @@ public int idx; private YAXIS(int c) { idx = c; - } + } } @@ -96,7 +96,7 @@ @Override protected String getDefaultYAxisLabel(int pos) { - return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT); + return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT); } diff -r db9e2bb34707 -r 5642a83420f2 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 Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Fri Jun 15 09:30:07 2012 +0000 @@ -23,8 +23,8 @@ import org.w3c.dom.Document; -public class FixWQCurveGenerator -extends XYChartGenerator +public class FixWQCurveGenerator +extends XYChartGenerator implements FacetTypes { private static Logger logger = @@ -93,7 +93,7 @@ logger.debug("doSectorAverageOut"); QWD[] qwds = (QWD[])aaf.getData(context); - + if(qwds != null) { // Draw vertical markers for(QWD qwd : qwds) { @@ -122,7 +122,7 @@ logger.debug("doAnalysisPeriodsOut"); DateRange[] dateRanges = (DateRange[])aaf.getData(context); - //TODO What to do with Date ranges? + //TODO What to do with Date ranges? } protected void doReferenceEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) { @@ -202,6 +202,6 @@ return yaxes[idx].toString(); } }; - } + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java Fri Jun 15 09:30:07 2012 +0000 @@ -144,6 +144,6 @@ new CollisionFreeXYTextAnnotationEntity(hotspot, rendererIndex, toolTipText, urlText); entities.add(entity); - } + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/jfree/JFreeUtil.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/JFreeUtil.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/JFreeUtil.java Fri Jun 15 09:30:07 2012 +0000 @@ -9,7 +9,7 @@ import org.jfree.chart.entity.EntityCollection; public class JFreeUtil { - + /** Do not instantiate. */ private JFreeUtil() { } @@ -29,7 +29,7 @@ if (entities == null) return false; Rectangle2D hotspotBox = hotspot.getBounds2D(); - + for (Iterator i = entities.iterator(); i.hasNext(); ) { Object next = i.next(); ChartEntity entity = (ChartEntity) next; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java Fri Jun 15 09:30:07 2012 +0000 @@ -280,7 +280,7 @@ return this.labelFont; } - + /** Set color with which to paint label. */ public void setLabelColor(Color color) { this.labelColor = color; @@ -637,7 +637,7 @@ for (; i < ni; ++i) { double x = dataset.getXValue(0, i); double y = dataset.getYValue(0, i); - if (!Double.isNaN(x) + if (!Double.isNaN(x) && !Double.isNaN(y) && add(six, x)) { siy.add(y); @@ -708,7 +708,7 @@ if (SIX > 0) { // should always be true double yns = Linear.linear( xns, - six.getQuick(SIX-1), x, + six.getQuick(SIX-1), x, siy.getQuick(SIX-1), y); if (debug) { log.debug("intersection at: " + yns); @@ -786,7 +786,7 @@ for (; i < N; ++i) { double x = dataset.getXValue(0, i); double y = dataset.getXValue(0, i); - if (!Double.isNaN(x) + if (!Double.isNaN(x) && !Double.isNaN(y) && add(six, x)) { siy.add(y); @@ -821,7 +821,7 @@ public static List splitByNaNs(XYDataset dataset) { switch (dataset.getSeriesCount()) { - case 0: + case 0: return Collections.emptyList(); case 1: return splitByNaNsOneSeries(dataset); @@ -863,7 +863,7 @@ switch (pass) { case 0: for (XYDataset ds: splitByNaNs(dataset)) { - drawItemPass0(g2, dataArea, info, + drawItemPass0(g2, dataArea, info, plot, domainAxis, rangeAxis, ds, series, item, crosshairState); } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java Fri Jun 15 09:30:07 2012 +0000 @@ -11,7 +11,7 @@ */ public class StickyAxisAnnotation { - /** Logger for this class. */ + /** Logger for this class. */ private static Logger logger = Logger.getLogger(StickyAxisAnnotation.class); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledAreaSeriesCollection.java Fri Jun 15 09:30:07 2012 +0000 @@ -19,7 +19,7 @@ * One or more dataseries to draw a polygon (either "open up/downwards", or * the area between two curves), a theme-document and further display options. * The theme-document will later "style" the graphical representation. - * The display options can be used to control the z-order and the axis of the + * The display options can be used to control the z-order and the axis of the * dataset. */ public class StyledAreaSeriesCollection extends XYSeriesCollection { diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledXYSeries.java --- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledXYSeries.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StyledXYSeries.java Fri Jun 15 09:30:07 2012 +0000 @@ -52,7 +52,7 @@ return style; } - + @Override public String getLabel() { return label; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeAccess.java --- a/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeAccess.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/themes/ThemeAccess.java Fri Jun 15 09:30:07 2012 +0000 @@ -48,7 +48,7 @@ return lineColor; } - + public Color parseTextColor() { if (textColor == null) { textColor = ThemeUtil.parseTextColor(theme); diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/DataUtil.java Fri Jun 15 09:30:07 2012 +0000 @@ -13,13 +13,13 @@ public static boolean guessWaterIncreasing(TDoubleArrayList data, float factor) { int N = data.size(); if (N < 2) return false; - + int samples = (int)(factor*N) + 1; - + int up = 0; - + Random rand = new Random(); - + for (int i = 0; i < samples; ++i) { int pos2 = rand.nextInt(N-1) + 1; int pos1 = rand.nextInt(pos2); @@ -27,7 +27,7 @@ double w2 = data.getQuick(pos2); if (w2 > w1) ++up; } - + return up > samples/2; } } diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/FLYSUtils.java Fri Jun 15 09:30:07 2012 +0000 @@ -742,7 +742,7 @@ WKms subtrahendWKms = getWKms(StringUtil.unbracket(datas[i+1]), context); if (minuendWKms != null && subtrahendWKms != null) { - diffs += StringUtil.wWrap(minuendWKms.getName()) + diffs += StringUtil.wWrap(minuendWKms.getName()) + " - " + StringUtil.wWrap(subtrahendWKms.getName()); } diffs += ";\n"; diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/utils/Formatter.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/Formatter.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/Formatter.java Fri Jun 15 09:30:07 2012 +0000 @@ -361,7 +361,7 @@ context, 0, 2); - + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r db9e2bb34707 -r 5642a83420f2 flys-artifacts/src/main/java/de/intevation/flys/utils/ThemeUtil.java --- a/flys-artifacts/src/main/java/de/intevation/flys/utils/ThemeUtil.java Thu Jun 14 15:46:20 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/utils/ThemeUtil.java Fri Jun 15 09:30:07 2012 +0000 @@ -319,7 +319,7 @@ return parseRGB(getTextColorString(theme)); } - + /** Parse color for line label(s text). */ public static Color parseLineLabelTextColor(Document theme) { return parseRGB(getLineLabelTextColorString(theme));