# HG changeset patch # User Sascha L. Teichmann # Date 1270551900 0 # Node ID 6cff63d0c434dafc02075ed256c1653db568fb6e # Parent 9d2891068ba5da4afd51217a3820255569c3b418 Fixed vim modeline. Added some Javadoc. gnv-artifacts/trunk@880 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/ChangeLog Tue Apr 06 11:05:00 2010 +0000 @@ -1,3 +1,15 @@ +2010-04-06 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/**/*.java: Fixed vim modeline. + + * src/main/java/de/intevation/gnv/math/L1Comparator.java: Moved + L1 code here. + + * src/main/java/de/intevation/gnv/math/Point2d.java: Removed dead + inverse L1 code. Added Javadoc. + + * src/main/java/de/intevation/gnv/math/IJKey.java: Added Javadoc. + 2010-04-06 Sascha L. Teichmann * src/test/java/de/intevation/gnv/artifacts/TestCallContext.java, diff -r 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java Tue Apr 06 11:05:00 2010 +0000 @@ -69,4 +69,4 @@ return dataset; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantFunction.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantFunction.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantFunction.java Tue Apr 06 11:05:00 2010 +0000 @@ -21,4 +21,4 @@ return value; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantXYDepth.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantXYDepth.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantXYDepth.java Tue Apr 06 11:05:00 2010 +0000 @@ -21,4 +21,4 @@ return depth; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/HeightValue.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/HeightValue.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/HeightValue.java Tue Apr 06 11:05:00 2010 +0000 @@ -43,4 +43,4 @@ return k; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/IJKey.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/IJKey.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/IJKey.java Tue Apr 06 11:05:00 2010 +0000 @@ -3,22 +3,41 @@ import java.io.Serializable; /** + * Tuple (i, j) to model a pair of integers. Useful to store index pairs + * in maps. * @author Sascha L. Teichmann */ public class IJKey implements Serializable { + /** + * i component of the tuple. + */ public int i; + /** + * j component of the tuple. + */ public int j; + /** + * Default constructor. + */ public IJKey() { } + /** + * Constructor to set i and j. + * @param i The i component. + * @param j The j component. + */ public IJKey(int i, int j) { this.i = i; this.j = j; } + /** + * Orders i and j by their values. + */ public void sort() { if (i > j) { int t = i; @@ -27,13 +46,28 @@ } } + /** + * Hashes i and j into a common value. + * @return + */ + @Override public int hashCode() { return (i << 16) | j; } + /** + * IJKeys are considered equal if the i and j components + * are equal. + * @param obj The other IJKey + * @return true if the IJKeys are equal else false. + */ + @Override public boolean equals(Object obj) { + if (!(obj instanceof IJKey)) { + return false; + } IJKey other = (IJKey)obj; return i == other.i && j == other.j; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java Tue Apr 06 11:05:00 2010 +0000 @@ -238,4 +238,4 @@ return m*x + b; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation3D.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation3D.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation3D.java Tue Apr 06 11:05:00 2010 +0000 @@ -238,4 +238,4 @@ return true; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolator.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolator.java Tue Apr 06 11:05:00 2010 +0000 @@ -3,10 +3,10 @@ import com.vividsolutions.jts.geom.Coordinate; /** - * @author Sascha L. Teichmann + * @author Sascha L. Teichmann */ public interface Interpolator { void interpolate(double t, Coordinate v); } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/L1Comparator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/L1Comparator.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/L1Comparator.java Tue Apr 06 11:05:00 2010 +0000 @@ -5,7 +5,7 @@ import java.util.Comparator; /** - * @author Sascha L. Teichmann + * @author Sascha L. Teichmann */ public class L1Comparator implements Comparator @@ -26,12 +26,16 @@ public int compare(Object a, Object b) { Coordinate pa = (Coordinate)a; Coordinate pb = (Coordinate)b; - double da = Point2d.L1(ref, pa); - double db = Point2d.L1(ref, pb); + double da = L1(ref, pa); + double db = L1(ref, pb); if (da < db) return -1; if (da > db) return +1; return 0; } + + public static double L1(Coordinate a, Coordinate b) { + return Math.abs(a.x - b.x) + Math.abs(a.y - b.y); + } + } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearMetrics.java Tue Apr 06 11:05:00 2010 +0000 @@ -3,7 +3,7 @@ import com.vividsolutions.jts.geom.Coordinate; /** - * @author Sascha L. Teichmann + * @author Sascha L. Teichmann */ public final class LinearMetrics implements Metrics @@ -56,4 +56,4 @@ return new LinearInterpolator(p1, p2); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java Tue Apr 06 11:05:00 2010 +0000 @@ -7,7 +7,7 @@ import java.util.NoSuchElementException; /** - * @author Sascha L. Teichmann + * @author Sascha L. Teichmann */ public class LinearToMap { @@ -181,4 +181,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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/Metrics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Metrics.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Metrics.java Tue Apr 06 11:05:00 2010 +0000 @@ -3,7 +3,7 @@ import com.vividsolutions.jts.geom.Coordinate; /** - * @author Sascha L. Teichmann + * @author Sascha L. Teichmann */ public interface Metrics { @@ -11,4 +11,4 @@ Interpolator getInterpolator(Coordinate p1, Coordinate p2); } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/Point2d.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Point2d.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Point2d.java Tue Apr 06 11:05:00 2010 +0000 @@ -8,15 +8,23 @@ import org.apache.log4j.Logger; /** - * @author Sascha L. Teichmann + * Point which besides the x, y, z coodinates has an index i, j pair + * to model neighborhood. + * @author Sascha L. Teichmann */ public class Point2d extends Coordinate { private static Logger log = Logger.getLogger(Point2d.class); + /** + * Numerical tolerance epsilon: {@value} + */ public static final double EPSILON = 1e-3d; + /** + * Compares two Point2ds by their x coordinates + */ public static final Comparator X_COMPARATOR = new Comparator() { public int compare(Object a, Object b) { double xa = ((Coordinate)a).x; @@ -27,6 +35,9 @@ } }; + /** + * Compares two Point2ds by their y coordinates. + */ public static final Comparator Y_COMPARATOR = new Comparator() { public int compare(Object a, Object b) { double ya = ((Coordinate)a).y; @@ -37,75 +48,116 @@ } }; - public static class InverseL1Comparator - implements Comparator - { - private Point2d ref; - - public InverseL1Comparator(Point2d ref) { - this.ref = ref; - } - - public int compare(Object a, Object b) { - Point2d pa = (Point2d)a; - Point2d pb = (Point2d)b; - double da = ref.L1(pa); - double db = ref.L1(pb); - if (da < db) return -1; - if (da > db) return +1; - return 0; - } - } // class InverseL1Comparator - + /** + * The i index of this Point2d. + */ public int i; + /** + * The j index of this Point2d. + */ public int j; + /** + * Default constructor. + */ public Point2d() { } + /** + * Constructor setting x and y coordinate. + * @param x The x coordinate. + * @param y The y coordinate. + */ public Point2d(double x, double y) { super(x, y); } + /** + * Constructor setting x, y and i, j. + * @param x The x coordinate. + * @param y The y coordinate. + * @param i The i index. + * @param j The j index. + */ public Point2d(double x, double y, int i, int j) { super(x, y); this.i = i; this.j = j; } + /** + * Constructor setting x, y, z and i, j. + * @param x The x coordinate. + * @param y The y coordinate. + * @param z The z coordinate. + * @param i The i index. + * @param j The j index. + */ public Point2d(double x, double y, double z, int i, int j) { super(x, y, z); this.i = i; this.j = j; } - + /** + * Calculates the L1 distance to another Point2d. + * @param other The other Point2d. + * @return The L1 distance. + */ public double L1(Point2d other) { - return L1(this, other); + return L1Comparator.L1(this, other); } - public static double L1(Coordinate a, Coordinate b) { - return Math.abs(a.x - b.x) + Math.abs(a.y - b.y); - } - + /** + * Creates an envelope around this Point2d with + * the numerical tolerance of {@link #EPSILON}. + * @return The envelope. + */ public Envelope envelope() { return envelope(EPSILON); } + /** + *Creates an envelope around this Point2d with + * a given tolerance. + * @param epsilon The tolerance in all directions. + * @return The envelope. + */ public Envelope envelope(double epsilon) { return new Envelope( x-epsilon, x+epsilon, y-epsilon, y+epsilon); } + /** + * Given this and another Point2d it looks if there is + * a gap between the in points in i index direction. + * @param other The other Point2d. + * @return true if there is is a gap, else false. + */ public boolean hasIGap(Point2d other) { return Math.abs(i - other.i) > 1; } + /** + * Given this and another Point2d it looks if there is + * a gap between the in points in j index direction. + * @param other The other Point2d. + * @return true if there is is a gap, else false. + */ public boolean hasJGap(Point2d other) { return Math.abs(j - other.j) > 1; } + /** + * Given this and another Point2d a new Point2d is + * created via {@link #newPoint() }. The x, y coordinate + * of the new point is on the line of this and the other + * given point at a given scaling point. + * @param t The scaling factor. + * @param other The other point. + * @return The new Point2d. + */ public Point2d extrapolate(double t, Point2d other) { if (other == null) { return null; @@ -116,14 +168,33 @@ return p; } + /** + * Creates a new Point2d or an instance of a subclass. + * Override this in subclasses. + * @return The new Point2d. + */ public Point2d newPoint() { return new Point2d(0d, 0d); } + /** + * Creates a new Point2d or an instance of a subclass + * at a given coordinate. + * Override this in subclasses. + * @param x The x coordinate. + * @param y The y coordinate. + * @return The new point. + */ public Point2d newPoint(double x, double y) { return new Point2d(x, y); } + /** + * Sets the z value to the inverse distance weighting (IDW) value + * of the z values of a set of given points. + * @param ps The points from wich the z values are taken + * to calculate the IDW. + */ public void inverseDistanceWeighting(Point2d [] ps) { double sum = 0d; @@ -156,6 +227,14 @@ z = v/sum; } + /** + * Creates a new point via {@link #newPoint() } with the + * x,y coordinates of the center of a given set of + * coordinates. + * @param ps The points from which the x,y coordinates are + * taken to calculate the center. + * @return The new center point. + */ public static Point2d average(Point2d [] ps) { Point2d p = null; @@ -184,6 +263,14 @@ return p; } + /** + * Checks if this Point2d is near to at least one point + * out of a given set of points. Near is defined by an + * euclidian distance small than {@link #EPSILON}. + * @param ps The set of points to be tested. + * @return true if this Point2d is near to one of the given + * points, else false. + */ public boolean near(Point2d [] ps) { for (int i = 0; i < ps.length; ++i) { @@ -196,4 +283,4 @@ return true; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYColumn.java Tue Apr 06 11:05:00 2010 +0000 @@ -124,4 +124,4 @@ return new SplineInterpolator(); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/math/XYDepth.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYDepth.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/XYDepth.java Tue Apr 06 11:05:00 2010 +0000 @@ -3,10 +3,18 @@ import com.vividsolutions.jts.geom.Coordinate; /** - * @author Sascha L. Teichmann + * Interface to encapsulate the query of the depth at a given point. + * @author Sascha L. Teichmann */ public interface XYDepth { + /** + * Returns the depth at a given coordinate. Negative + * values are below the water surface. + * @param coordinate The coordinate where to take the depth. + * @return The depth at the queried coordinate. NaN is no + * depth is available at the given point. + */ double depth(Coordinate coordinate); } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/Filter.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Filter.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Filter.java Tue Apr 06 11:05:00 2010 +0000 @@ -17,4 +17,4 @@ Raster filter(Raster raster); } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoAttributeGenerator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoAttributeGenerator.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoAttributeGenerator.java Tue Apr 06 11:05:00 2010 +0000 @@ -31,4 +31,4 @@ : 0.5d*(e2.getTo()+e1.getFrom())); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoPolygonSeriesProducer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoPolygonSeriesProducer.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoPolygonSeriesProducer.java Tue Apr 06 11:05:00 2010 +0000 @@ -114,4 +114,4 @@ return series; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/KernelFilter.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/KernelFilter.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/KernelFilter.java Tue Apr 06 11:05:00 2010 +0000 @@ -67,4 +67,4 @@ return raster.create(kernel); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Tue Apr 06 11:05:00 2010 +0000 @@ -286,4 +286,4 @@ return lookup.findByIndex(index); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/PaletteManager.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PaletteManager.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PaletteManager.java Tue Apr 06 11:05:00 2010 +0000 @@ -68,4 +68,4 @@ return palette; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Tue Apr 06 11:05:00 2010 +0000 @@ -83,4 +83,4 @@ return new PolygonDataset(polygonSeries.values()); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/Raster.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Raster.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Raster.java Tue Apr 06 11:05:00 2010 +0000 @@ -234,4 +234,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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java Tue Apr 06 11:05:00 2010 +0000 @@ -340,4 +340,4 @@ return regions; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/ExtendedKeyValueData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/ExtendedKeyValueData.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/ExtendedKeyValueData.java Tue Apr 06 11:05:00 2010 +0000 @@ -24,4 +24,4 @@ return parameter; } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Tue Apr 06 11:05:00 2010 +0000 @@ -47,4 +47,4 @@ super.setup(identifier, factory, context, data); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/utils/IndexBuffer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/IndexBuffer.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/IndexBuffer.java Tue Apr 06 11:05:00 2010 +0000 @@ -166,4 +166,4 @@ return new Point2D.Double(p.y, -p.x); } } -// 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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Tue Apr 06 11:05:00 2010 +0000 @@ -31,7 +31,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; - /** * @author Ingo Weinzierl */ @@ -432,4 +431,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 9d2891068ba5 -r 6cff63d0c434 gnv-artifacts/src/main/java/de/intevation/gnv/utils/StringUtils.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/StringUtils.java Tue Apr 06 07:01:03 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/StringUtils.java Tue Apr 06 11:05:00 2010 +0000 @@ -42,4 +42,4 @@ return false; } } -// 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 :