# HG changeset patch # User Sascha L. Teichmann # Date 1270626747 0 # Node ID feae2f9d6c6f9812b2db7c682e864462a209de12 # Parent 4abe172be9701bceba6017a0cb6e35d2f0e61552 Removed trailing whitespace. gnv-artifacts/trunk@885 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/ChangeLog Wed Apr 07 07:52:27 2010 +0000 @@ -1,3 +1,8 @@ +2010-04-07 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/**/*.java: + Removed trailing whitespace. + 2010-04-07 Sascha L. Teichmann * src/main/java/de/intevation/gnv/raster/ExternalIndexConverter.java, @@ -241,7 +246,7 @@ * src/test/java/de/intevation/gnv/**/*.java, src/main/java/de/intevation/gnv/**/*.java: Removed trailing whitespace. - find -name \*.java | xargs sed -i 's/[ \t]\+$//' + find -name \*.java | xargs sed -i 's/[ \t]\+$// 2010-03-26 Tim Englich diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Wed Apr 07 07:52:27 2010 +0000 @@ -57,7 +57,7 @@ /** * This is the major gnv artifact and handles the requests specified in * {@link de.intevation.artifactdatabase.Artifact}. - * + * * @author Tim Englich * @author Ingo Weinzierl * @author Sascha L. Teichmann @@ -165,7 +165,7 @@ * This method handles request for changing the current state of an * artifact. It is possible to step forward, backward, or to the initial * state for choosing a fis. - * + * * @param target * @param context * @return @@ -535,7 +535,7 @@ /** * Initialse this artifact and insert some data if data * contains necessary information for this artifact. - * @param identifier + * @param identifier * @param context * @param factory * @param data @@ -627,7 +627,7 @@ /** * Determine the wish to append the user interface description to the * describe document. - * + * * @param document * @return True, if the user interface description should be appended, * otherwise false. @@ -687,7 +687,7 @@ /** * Create the fis select box. - * + * * @param artCreator * @param creator * @param document diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Wed Apr 07 07:52:27 2010 +0000 @@ -6,7 +6,7 @@ /** * This artifact is used to be fed before the parameterization has started. - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java Wed Apr 07 07:52:27 2010 +0000 @@ -7,7 +7,7 @@ /** * The CacheFactory is used to initialize and retrieve Cache. - * + * * @author Tim Englich */ public class CacheFactory { diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Wed Apr 07 07:52:27 2010 +0000 @@ -44,7 +44,7 @@ * This factory class is used to create new GNVArtfactContext objects, * initialize required components and put them into the created context object * for being available in the application. - * + * * @author Tim Englich * @author Ingo Weinzierl * @author Sascha L. Teichmann @@ -162,7 +162,7 @@ /** * Create a new {@link GNVArtifactContext} object and initialize all * components required by the application. - * + * * @param config * @return GNVArtifactContext * @see de.intevation.artifacts.ArtifactContextFactory#createArtifactContext(org.w3c.dom.Document) diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Wed Apr 07 07:52:27 2010 +0000 @@ -43,7 +43,7 @@ * parameterization when no product has been selected so far. After the user * having selected a product, this artifact is replaced by a concrete product * artifact. - * + * * @author Ingo Weinzierl */ public class SelectProductArtifact extends GNVDefaultArtifact { @@ -219,7 +219,7 @@ * If {@link #feed(org.w3c.dom.Document, de.intevation.artifacts.CallContext)} * was sucessfully called before, this artifact is replaced with a concrete * product artifact. - * + * * @param target * @param context * @return @@ -289,7 +289,7 @@ /** * Create a describe document including the user interface description. The * user gets the choice to select a product supported by the current fis. - * + * * @param data * @param context * @return @@ -469,7 +469,7 @@ /** * Create a feed document. - * + * * @param uuid * @param hash * @return diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Wed Apr 07 07:52:27 2010 +0000 @@ -6,7 +6,7 @@ /** * This is the default implementation of Product. - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Wed Apr 07 07:52:27 2010 +0000 @@ -147,7 +147,7 @@ /** * Deliveres the language specific value for the given key - * + * * @param locale * @param key * @param defaultVal diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Wed Apr 07 07:52:27 2010 +0000 @@ -94,7 +94,7 @@ /** * @param data - * @param globalContext + * @param globalContext * @param callMeta * @return * @see de.intevation.artifactdatabase.DefaultService#process(org.w3c.dom.Document, java.lang.Object, de.intevation.artifacts.CallMeta) @@ -451,7 +451,7 @@ } /** - * @param factory + * @param factory * @param globalContext * @see de.intevation.artifactdatabase.DefaultService#setup(de.intevation.artifacts.ServiceFactory, java.lang.Object) */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Wed Apr 07 07:52:27 2010 +0000 @@ -18,7 +18,7 @@ /** * Constructor - * + * * @param id The id for this fis. */ public DefaultFIS(String id){ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Wed Apr 07 07:52:27 2010 +0000 @@ -63,7 +63,7 @@ /** * This methods returns this layer as string. - * + * * @return this layer as string. */ @Override diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Wed Apr 07 07:52:27 2010 +0000 @@ -4,7 +4,7 @@ /** * The default implementation of MapService. - * + * * @author Tim Englich * */ @@ -17,7 +17,7 @@ private String type = null; private String url = null; - + /** * Constructor * @param id The id of this service. diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Wed Apr 07 07:52:27 2010 +0000 @@ -33,7 +33,7 @@ * @return true, if this layer is a group layer - otherwise false. */ boolean isGroupLayer(); - + /** * * @return the id of the parent. diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Wed Apr 07 07:52:27 2010 +0000 @@ -12,7 +12,7 @@ *
  • getLayer(): Returns a collection of layers contained in this service. *
    • * - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalCrossSectionChart.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalCrossSectionChart.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalCrossSectionChart.java Wed Apr 07 07:52:27 2010 +0000 @@ -323,7 +323,7 @@ /** * Set the background paint of {@link #chart}. - * @param paint + * @param paint */ public void setBackgroundPaint(Paint paint) { chart.setBackgroundPaint(paint); diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Wed Apr 07 07:52:27 2010 +0000 @@ -267,7 +267,7 @@ /** - * @param parameter + * @param parameter * @see de.intevation.gnv.chart.AbstractXYLineChart#addSeries(Series, String, * int) */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/exports/StringArrayKey.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/StringArrayKey.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/StringArrayKey.java Wed Apr 07 07:52:27 2010 +0000 @@ -1,8 +1,8 @@ package de.intevation.gnv.exports; /** - * A simple Key Class for generating an syntetic key using the + * A simple Key Class for generating an syntetic key using the * values of the given Stringarray and not the Hash of the Stringarray - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonDataset.java Wed Apr 07 07:52:27 2010 +0000 @@ -12,7 +12,7 @@ * An implementation of {@link org.jfree.data.xy.XYDataset} to create 2D charts. * This dataset contains several PolygonSeries and is used by * PolygonRenderer to draw its items into a 2D chart. - * + * * @author Ingo Weinzierl */ public class PolygonDataset @@ -42,7 +42,7 @@ /** * Constructs a PolygonDataset with a single PolygonSeries. - * + * * @param series A PolygonSeries. */ public PolygonDataset(PolygonSeries series) { diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Wed Apr 07 07:52:27 2010 +0000 @@ -34,7 +34,7 @@ /** * A class for plotting polygons into a 2D chart. This plot makes use of * PolygonRenderer. - * + * * @author Ingo Weinzierl */ // TODO implement cloneable @@ -294,7 +294,7 @@ /** * Method to draw the axis for this plot. - * + * * @param g2 * @param plotArea * @param dataArea @@ -391,7 +391,7 @@ /** * Plot the polygons. Uses PolygonRenderer to do this job. - * + * * @param g2 * @param area * @param info @@ -422,7 +422,7 @@ /** - * + * * @param g2 * @param plotArea * @param space @@ -581,7 +581,7 @@ /** - * + * * @param dataset * @return true, if dataset is null or if it does not contain any * PolygonSeries, otherwise false. diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java Wed Apr 07 07:52:27 2010 +0000 @@ -28,7 +28,7 @@ /** * This renderer is used to draw polygons into a Graphics object. - * + * * @author Ingo Weinzierl * @author Sascha L. Teichmann */ @@ -162,7 +162,7 @@ /** * Draw labels at each item of a series in the given dataset. If the series * has no label attritue, no label is drawn. - * + * * @param graphics * @param plot * @param area diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonSeriesLabelGenerator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonSeriesLabelGenerator.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonSeriesLabelGenerator.java Wed Apr 07 07:52:27 2010 +0000 @@ -2,7 +2,7 @@ /** * This interface describes a single method generating labels by given Series. - * + * * @author Sascha L. Teichmann */ public interface PolygonSeriesLabelGenerator diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java Wed Apr 07 07:52:27 2010 +0000 @@ -34,7 +34,7 @@ /** - * + * * @param identifier * @param factory * @param context diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Wed Apr 07 07:52:27 2010 +0000 @@ -50,7 +50,7 @@ /** * This method is called just before an artifact is exported. It removes all * data which should not serialized into an export. - * + * * @param context CallContext object. */ @Override diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/AbstractProducer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/AbstractProducer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/AbstractProducer.java Wed Apr 07 07:52:27 2010 +0000 @@ -3,7 +3,7 @@ import de.intevation.gnv.raster.Vectorizer.RingsHandler; /** - * Abstract base class for producing multi polygons and + * Abstract base class for producing multi polygons and * multi line strings. This base class stores a bounding box * of world coordinates which helps to transform the index * spaced egde data into real world coordinates. diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java Wed Apr 07 07:52:27 2010 +0000 @@ -10,7 +10,7 @@ * Ring Handler that demultiplexes to a list of other ring handlers. * Handy if you want to pipe the polygons and line strings produced * by the Vectorize to more than one handler at once. - * + * * @author Sascha L. Teichmann */ public class DemuxRingsHandler diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/ExternalIndexConverter.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/ExternalIndexConverter.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/ExternalIndexConverter.java Wed Apr 07 07:52:27 2010 +0000 @@ -5,7 +5,7 @@ /** * Converts the interal color index of a polygon to the external index * defined by the corresponding palette entry. - * + * * @author Sascha L. Teichmann */ public class ExternalIndexConverter diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiLineStringProducer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiLineStringProducer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiLineStringProducer.java Wed Apr 07 07:52:27 2010 +0000 @@ -24,7 +24,7 @@ /** * Vectorizer backend to generated iso lines in form of * JTS multi linestrings. - * + * * @author Sascha L. Teichmann */ public class JTSMultiLineStringProducer diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiPolygonProducer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiPolygonProducer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiPolygonProducer.java Wed Apr 07 07:52:27 2010 +0000 @@ -26,7 +26,7 @@ /** * Vectorizer backend to generated polygons in form of * JTS multi multi polygons. - * + * * @author Sascha L. Teichmann */ public class JTSMultiPolygonProducer diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Wed Apr 07 07:52:27 2010 +0000 @@ -90,7 +90,7 @@ /** * Compares two entries by the start point of the interval. * @param other - * @return -1 if this start point is before other. +1 if this + * @return -1 if this start point is before other. +1 if this * start point is after, else 0. */ public int compareTo(Object other) { @@ -210,7 +210,7 @@ * Internal table of the entrys. */ protected Entry [] entries; - + /** * Root of the entry tree used to map values to entries. */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Wed Apr 07 07:52:27 2010 +0000 @@ -14,7 +14,7 @@ /** * Vectorizer backend to produce polygon datasets suitable to being * displayed with {@link de.intevation.gnv.jfreechart.PolygonPlot}. - * + * * @author Sascha L. Teichmann */ public class PolygonDatasetProducer diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Wed Apr 07 07:52:27 2010 +0000 @@ -26,9 +26,9 @@ super(); } - + /** - * + * * @param result * @param uuid * @return @@ -40,7 +40,7 @@ /** - * + * * @param data * @param uuid * @return diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultExportMode.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultExportMode.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultExportMode.java Wed Apr 07 07:52:27 2010 +0000 @@ -2,7 +2,7 @@ /** * This is the default implementation of ExportMode. - * + * * @author Ingo Weinzierl */ public class DefaultExportMode diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputData.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputData.java Wed Apr 07 07:52:27 2010 +0000 @@ -8,7 +8,7 @@ /** * The default implementation of InputData. This object stores * multiple values separated by {@link #VALUE_SEPARATOR} for a specific key. - * + * * @author Tim Englich * @author Ingo Weinzierl */ @@ -41,7 +41,7 @@ * should have an own description in this map. */ protected Map description; - + /** * An extra object. Might be everything. */ @@ -128,7 +128,7 @@ /** * Return all descriptions as array. - * + * * @return descriptions as array. */ public String[] getDescription() { diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Wed Apr 07 07:52:27 2010 +0000 @@ -3,7 +3,7 @@ /** * The default implementation of InputValue. InputValue objects are * used to store meta information about InputData objects. - * + * * @author Tim Englich */ public class DefaultInputValue implements InputValue { @@ -63,7 +63,7 @@ /** * Returns the information as string. - * + * * @return information as string. */ @Override diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultOutputMode.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultOutputMode.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultOutputMode.java Wed Apr 07 07:52:27 2010 +0000 @@ -5,7 +5,7 @@ /** * The default implementation of OutputMode. - * + * * @author Tim Englich * @author Ingo Weinzierl */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Wed Apr 07 07:52:27 2010 +0000 @@ -2,7 +2,7 @@ /** * This is the default implementation of StateBase. - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/ExtendedInputData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/ExtendedInputData.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/ExtendedInputData.java Wed Apr 07 07:52:27 2010 +0000 @@ -3,7 +3,7 @@ /** * This class is used to save the relation between two attributes. Mainly used * to save the relation between a measurement and the parameter it belongs to. - * + * * @see MeasurementState * @author Ingo Weinzierl */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Wed Apr 07 07:52:27 2010 +0000 @@ -5,7 +5,7 @@ /** * This interface defines the basic methods used to store multiple values with * a specific key and name. - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java Wed Apr 07 07:52:27 2010 +0000 @@ -5,7 +5,7 @@ /** * This interface defines some basic methods to retrieve information about the * type of an user input. - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MeasurementState.java Wed Apr 07 07:52:27 2010 +0000 @@ -39,7 +39,7 @@ * parameter in a single row, each measurement in a column. An invalid * measurement column for a specific parameter is marked as disabled and should * not be selected. - * + * * @author Ingo Weinzierl */ public class MeasurementState @@ -96,7 +96,7 @@ /** * Initialize the measurements used in this matrix. - * + * * @param data The measurements. */ private void initMeasurements(Collection data) { @@ -135,7 +135,7 @@ /** * Initialize the parameters used in this matrix. - * + * * @param parameter Parameters. */ private void initParameters(String[] parameter) { @@ -146,7 +146,7 @@ /** * Returns the number of measurements. - * + * * @return the number of measurements. */ public int measurementSize() { @@ -158,7 +158,7 @@ /** * Returns the number of parameters. - * + * * @return number of parameters. */ public int parameterSize() { @@ -170,7 +170,7 @@ /** * Returns the measurement at idx. - * + * * @param idx Index. * @return the measurement. */ @@ -184,7 +184,7 @@ /** * Returns the parameter at idx. - * + * * @param idx Index * @return the parameter. */ @@ -214,7 +214,7 @@ /** * This method returns true, if a measurement is valid for a specific * parameter - otherwise false. - * + * * @param i Index of a measurement column. * @param j Index of a parameter row. * @return true, if valid, else false. @@ -278,7 +278,7 @@ * This method create the user interface description for measurement and * parameters as matrix. A row for each parameter, a column for each * measurement. - * + * * @param artCreator * @param creator * @param document @@ -356,7 +356,7 @@ * This feed takes some input data storing measurement ids and parameter ids * and put them into ExtendedInputData objects to save the relation between * a measurement and the parameter it belongs to. - * + * * @param context * @param input * @param uuid diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java Wed Apr 07 07:52:27 2010 +0000 @@ -60,7 +60,7 @@ * displayed in the gui to give the user an orientation of the range he is * able to insert. * - * @param uuid + * @param uuid * @return */ @Override @@ -88,7 +88,7 @@ /** * @param context * @param uuid - * @param inputData + * @param inputData * @return * @throws StateException */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Wed Apr 07 07:52:27 2010 +0000 @@ -17,7 +17,7 @@ *
  • out(): To start an output of the current state.
    • *
  • getOutputModes(): To retrieve a list of possible output modes.
    • * - * + * * @author Tim Englich */ public interface OutputState @@ -30,7 +30,7 @@ * @param format * @param inputData * @param outputStream - * @param uuid + * @param uuid * @param callContext * @throws StateException */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Wed Apr 07 07:52:27 2010 +0000 @@ -108,7 +108,7 @@ } /** - * + * * @return */ public Collection getOutputModes() { @@ -186,7 +186,7 @@ } /** - * @param uuid + * @param uuid * @param context * @throws StateException */ @@ -233,10 +233,10 @@ /** * This method needs to be defined by concrete subclasses. Nothing is done * here. - * + * * @param outputMode * @param inputData - * @param outputStream + * @param outputStream * @throws StateException * @see de.intevation.gnv.state.OutputState#out(java.lang.String, * java.util.Collection, java.io.OutputStream) @@ -251,7 +251,7 @@ * cache yet, or if no cache is configured. If the cache is configured, but * the data is not in cache yet, put it into cache for a faster access * in a later time. - * + * * @param uuid The uuid of an artifact. * @param callContext The CallContext. * @return the chart data. @@ -295,7 +295,7 @@ * @param uuid * @param callContext * @return - * @deprecated + * @deprecated */ protected Object getChartFromCache(String uuid, CallContext callContext) { log.debug("Fetch chart [" + uuid + "] from cache"); @@ -375,7 +375,7 @@ * This method should no longer be used. It removes a chart from cache. * * @param uuid - * @deprecated + * @deprecated */ protected void removeChart(String uuid) { log.debug("OutputStateBase.removeChart from cache"); diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Wed Apr 07 07:52:27 2010 +0000 @@ -15,7 +15,7 @@ /** * This method looks for former inserted coordinates before initialization. - * + * * @author Tim Englich */ public class PreSettingsTransferCoordinateSelectionState extends CoordinateSelectionState { @@ -39,7 +39,7 @@ /** * Lookup mechanism for former inserted data before intialization begins. - * + * * @param uuid * @param context * @throws StateException @@ -63,7 +63,7 @@ /** - * + * * @param configuration */ @Override diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Wed Apr 07 07:52:27 2010 +0000 @@ -41,7 +41,7 @@ /** * This method does a lookup for already inserted data before initializing * it. - * + * * @param uuid * @param context * @throws StateException @@ -65,7 +65,7 @@ /** - * + * * @param configuration */ @Override diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/State.java Wed Apr 07 07:52:27 2010 +0000 @@ -15,7 +15,7 @@ /** * This interface describes the basic method a concrete state class needs to * implement. - * + * * @author Tim Englich * @author Ingo Weinzierl * @author Sascha L. Teichmann @@ -174,7 +174,7 @@ /** * Method to remove the data stored at a state which should not be * serialized while an artifact is exported. - * + * * @param context The CallContext */ public void cleanup(Object context); diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Wed Apr 07 07:52:27 2010 +0000 @@ -753,9 +753,9 @@ } /** - * @param document - * @param rootNode - * @param context + * @param document + * @param rootNode + * @param context * @param uuid * @see de.intevation.gnv.state.State#describe(org.w3c.dom.Document, * org.w3c.dom.Node, de.intevation.artifacts.CallMeta, @@ -1156,7 +1156,7 @@ /** - * @param uuid + * @param uuid * @return * @see de.intevation.gnv.state.State#getDescibeData() */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Wed Apr 07 07:52:27 2010 +0000 @@ -9,7 +9,7 @@ /** * This factory should be used to create new state objects with help of a * configuration segment. - * + * * @author Tim Englich * */ diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Wed Apr 07 07:52:27 2010 +0000 @@ -77,7 +77,7 @@ private String shapeFilePath; private String templateID = null; - + private String geometryType = null; public static final String SHAPEFILE_NAME = "data.shp"; @@ -251,27 +251,27 @@ String returnValue = null; String[] tables = tableName.toUpperCase().split(","); String[] filter = tables[0].split("\\."); - + try { - Collection result = + Collection result = queryExecutor.executeQuery(this.geometryTypeQueryID, filter); if (result != null && !result.isEmpty()) { int geometryCode = result.iterator().next().getInteger(0); - if (geometryCode == 11 || + if (geometryCode == 11 || geometryCode == 10){ returnValue = "MultiPolygon"; - }else if (geometryCode == 9 || + }else if (geometryCode == 9 || geometryCode == 8){ returnValue = "MultiLineString"; }else if (geometryCode == 7){ returnValue = "MultiPoint"; }else if (geometryCode == 6){ returnValue = "GeometryCollection"; - }else if (geometryCode == 5 || + }else if (geometryCode == 5 || geometryCode == 4){ returnValue = "Polygon"; - }else if (geometryCode == 3 || + }else if (geometryCode == 3 || geometryCode == 2){ returnValue = "LineString"; }else if (geometryCode == 1){ @@ -283,7 +283,7 @@ } catch (QueryException e) { log.error(e,e); } - + return returnValue; } private String fetchColumns(String tableName){ @@ -500,7 +500,7 @@ if (!MapfileGenerator.getInstance().templateExists(paramType)){ // If the template doesn't exist the Defaulttemplates will be used. - paramType = LAYER_MODEL+"_"+ + paramType = LAYER_MODEL+"_"+ this.determineDefaultTemplateName(geometryType); } Document meta = MetaWriter.writeLayerMeta(callContext, uuid, @@ -531,7 +531,7 @@ } return returnValue; } - + private String determineDefaultTemplateName(String geometryType){ String returnValue = geometryType.toLowerCase(); diff -r 4abe172be970 -r feae2f9d6c6f gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Wed Apr 07 07:49:12 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Wed Apr 07 07:52:27 2010 +0000 @@ -66,7 +66,7 @@ public static boolean isInputValid(String input, String type) { log.debug("InputValidator.isInputValid " + input + " " + type); - // Let's check polygons and linestrings first, because they might + // Let's check polygons and linestrings first, because they might // contain comma. A splitting at comma characters wouldn't be good here. if ("Polygon".equalsIgnoreCase(type) || "Linestring".equalsIgnoreCase(type)) {