# HG changeset patch # User Sascha L. Teichmann # Date 1271496924 0 # Node ID 2423cefe7d392b2b211844a86adb62e71e0d21fc # Parent 520a3b4da484e94a273bb5e49af41a031d5d33af Removed trailing whitespace. gnv-artifacts/trunk@936 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/ChangeLog Sat Apr 17 09:35:24 2010 +0000 @@ -1,3 +1,8 @@ +2010-04-17 Sascha L. Teichmann + + * src/main/java/de/intevation/gnv/**/*.java: + Removed trailing whitespace. + 2010-04-16 Tim Englich ISSUE232 diff -r 520a3b4da484 -r 2423cefe7d39 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 Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Sat Apr 17 09:35:24 2010 +0000 @@ -36,13 +36,13 @@ import de.intevation.gnv.utils.ArtifactXMLUtilities; /** - * This Class Provides the Functionality to return only those + * This Class Provides the Functionality to return only those * Artifacfactories which fulfill the conditions of the Request. - * - * This Service is used to implement the Functionality of the MV-GNV-Interface - * by looking if an Region of an FIS is intersecting the Area which is send + * + * This Service is used to implement the Functionality of the MV-GNV-Interface + * by looking if an Region of an FIS is intersecting the Area which is send * during the Request or which FIS belongs to the requested MapServices. - * + * * @author Tim Englich * */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java Sat Apr 17 09:35:24 2010 +0000 @@ -73,7 +73,7 @@ private static Logger log = Logger.getLogger(TimeSeriesChart.class); static { - /* The percentage defining the width of a gap should be configured in + /* The percentage defining the width of a gap should be configured in * conf.xml instead of being configured in a system property */ GAP_SIZE = Integer.getInteger("chart.gap.percentage", GAP_SIZE); } diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Sat Apr 17 09:35:24 2010 +0000 @@ -69,7 +69,7 @@ protected Map values; static { - /* The percentage defining the width of a gap should be configured in + /* The percentage defining the width of a gap should be configured in * conf.xml instead of being configured in a system property */ PERCENTAGE = Integer.getInteger("chart.gap.percentage", PERCENTAGE); } diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java Sat Apr 17 09:35:24 2010 +0000 @@ -30,7 +30,7 @@ * Collection of parameters. */ private Collection parameters = null; - + /** * The TimeStime which should be integrated in the Export to mark a * TimeSeries. @@ -42,8 +42,8 @@ * @param collector DataCollector used to extract the required data. * @param parameters A collection of parameters to be displayed in the * export. - * @param startTime The TimeStamp which should ne integrated in the export - * to mark a TimeSeries. If it should not be a TimeSeries this Value must + * @param startTime The TimeStamp which should ne integrated in the export + * to mark a TimeSeries. If it should not be a TimeSeries this Value must * be null. */ public ODVExport(DataCollector collector, Collection parameters, String startTime) { @@ -63,7 +63,7 @@ for (int i= 0; i < header.length; i++){ headerList.add(header[i]); } - + if (this.startTime != null){ headerList.add("time_ISO8601"); } diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Sat Apr 17 09:35:24 2010 +0000 @@ -3,7 +3,7 @@ /** * This is the default implementation of KeyValueDescibeData. This * class just implements the necessary methods and two constructors. - * + * * @author Tim Englich */ public class DefaultKeyValueDescribeData implements KeyValueDescibeData { diff -r 520a3b4da484 -r 2423cefe7d39 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 Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/ExtendedKeyValueData.java Sat Apr 17 09:35:24 2010 +0000 @@ -5,7 +5,7 @@ /** * This implementation improves the DefaultKeyValueDescribeData and * establishes another field to store a further parameter. - * + * * @author Ingo Weinzierl */ public class ExtendedKeyValueData diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Sat Apr 17 09:35:24 2010 +0000 @@ -5,14 +5,14 @@ /** * This interface defines some methods to retrieve a key-value pair, a state * this data belongs to and a boolean property, if this data have been selected. - * + * * @author Tim Englich */ public interface KeyValueDescibeData extends Serializable { /** * Returns the key of this data object. - * + * * @return the key. */ public String getKey(); diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Sat Apr 17 09:35:24 2010 +0000 @@ -3,7 +3,7 @@ /** * This interface describes some methods to set and retrieve a min-max value * pair with a specific name. - * + * * @author Tim Englich */ public interface MinMaxDescribeData extends DescribeData { diff -r 520a3b4da484 -r 2423cefe7d39 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 Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Sat Apr 17 09:35:24 2010 +0000 @@ -55,7 +55,7 @@ * The Basename of the Templates for the WMS-Exports */ public static final String LAYER_MODEL = "layer"; - + /** * The Name of the Shapefile which will be generated. */ @@ -73,13 +73,13 @@ private String geometryQueryID = null; /** - * The ID of the Query for fetching the Columnnames of the Table which + * The ID of the Query for fetching the Columnnames of the Table which * should put into the Shapefile. */ private String columnQueryID = null; /** - * The ID of the Query for fetching the Information which kind of Geometry + * The ID of the Query for fetching the Information which kind of Geometry * should be put into the Shapefile. */ private String geometryTypeQueryID = null; @@ -161,7 +161,7 @@ /** * Fetches the Data from the Databasebackend. - * + * * @return the resultdata. */ protected Collection fetchData(){ @@ -484,7 +484,7 @@ } } - + private static File shapefileDirectory(CallContext callContext) { // TODO: Refactoring nessessary it should be used only one Shapefilepath // for alle Modes. Code was taken from HorizontalCrossSectionMeshOutputState @@ -633,7 +633,7 @@ */ private String findParameterTitle(String geometryType) { String paramType = LAYER_MODEL+"_"+templateID; - + if (!MapfileGenerator.getInstance().templateExists(paramType)){ // If the template doesn't exist the Defaulttemplates will be used. paramType = LAYER_MODEL+"_"+ @@ -662,7 +662,7 @@ /** * Turns the geometry type into a form used for the templating mechanism * while mapfile generation. - * + * * @param geometryType The original geometry type. * @return a valid geometry type fpr the template mechanism. */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Sat Apr 17 09:35:24 2010 +0000 @@ -48,7 +48,7 @@ /** * This OutputState is used for 'Horizontalschnitt' products. - * + * * @author Tim Englich * @author Ingo Weinzierl * @author Sascha L. Teichmann @@ -232,7 +232,7 @@ /** * The chart subtitle created by this method is build up of the timeperiod. - * + * * @param locale The Locale used to adjust the language of the subtitle. * @param uuid The UUID of the current artifact. * @return a timeperiod as string. diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Sat Apr 17 09:35:24 2010 +0000 @@ -33,7 +33,7 @@ /** * This OutputState is used for 'Horizontalprofile' products. - * + * * @author Tim Englich * @author Ingo Weinzierl */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Sat Apr 17 09:35:24 2010 +0000 @@ -22,7 +22,7 @@ /** * This states handles coordinate inputs. - * + * * @author Tim Englich */ public class NorthSouthEastWestState extends StateBase { diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Sat Apr 17 09:35:24 2010 +0000 @@ -339,7 +339,7 @@ && (path = writeToShapeFile(uuid, result, callContext)) != null) { String paramType = findParameterType(callContext); - + String title = getLayerTitle(inputData); if (title == null) { title = uuid; diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Sat Apr 17 09:35:24 2010 +0000 @@ -502,8 +502,8 @@ * @throws IOException * @throws StateException */ - protected void createODV(OutputStream outputStream, - String uuid, + protected void createODV(OutputStream outputStream, + String uuid, CallContext callContext) throws IOException, StateException { @@ -656,7 +656,7 @@ }else{ return null; } - + } /** diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/statistics/AbstractStatistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/AbstractStatistics.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/AbstractStatistics.java Sat Apr 17 09:35:24 2010 +0000 @@ -10,7 +10,7 @@ * An abstract implementation of Statistics with a default * implementation of the {@link #generateStatisticsValues(org.apache.commons.math.stat.descriptive.DescriptiveStatistics, org.apache.commons.math.stat.regression.SimpleRegression, java.lang.String)} * method. - * + * * @author Sascha L. Teichmann */ public abstract class AbstractStatistics diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java Sat Apr 17 09:35:24 2010 +0000 @@ -15,7 +15,7 @@ /** * This class is used to create a statistic for 'Horizontalprofil' products. - * + * * @author Tim Englich * */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalCrossSectionStatistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalCrossSectionStatistics.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalCrossSectionStatistics.java Sat Apr 17 09:35:24 2010 +0000 @@ -13,7 +13,7 @@ /** * This class is used to create a statistic in 'Profilschnitt' products. - * + * * @author Sascha L. Teichmann */ public class VerticalCrossSectionStatistics @@ -25,7 +25,7 @@ public VerticalCrossSectionStatistics() { } - + public Collection calculateStatistics( Object result, Collection parameters, diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Sat Apr 17 09:35:24 2010 +0000 @@ -10,7 +10,7 @@ /** * This class is used to create a statistic in 'Vertikalprofil' products. - * + * * @author Tim Englich */ public class VerticalProfileStatistics extends TimeseriesStatistics { diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Sat Apr 17 09:35:24 2010 +0000 @@ -10,7 +10,7 @@ /** * Artifact used for product timeseries product. - * + * * @author Tim Englich * @author Ingo Weinzierl * diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Sat Apr 17 09:35:24 2010 +0000 @@ -2,7 +2,7 @@ /** * Artifact used for timeseries on meshes. - * + * * @author Tim Englich */ public class TimeSeriesMeshArtifact extends TimeSeriesArtifact { diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Sat Apr 17 09:35:24 2010 +0000 @@ -2,7 +2,7 @@ /** * The default implementation of TimeGap. - * + * * @author Tim Englich */ public class DefaultTimeGap implements TimeGap { diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/DefaultTransition.java Sat Apr 17 09:35:24 2010 +0000 @@ -4,7 +4,7 @@ /** * The default implementation of a Transition. - * + * * @author Tim Englich * */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Sat Apr 17 09:35:24 2010 +0000 @@ -26,7 +26,7 @@ private static Logger log = Logger.getLogger(PresettingsValueCompareTransition.class); /** - * The Name of the Datafield the Value that should be compared + * The Name of the Datafield the Value that should be compared * should be fetched from. */ private String dataName = null; diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Sat Apr 17 09:35:24 2010 +0000 @@ -6,7 +6,7 @@ /** * An abstract implementation of Transition. - * + * * @author Tim Englich * */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Sat Apr 17 09:35:24 2010 +0000 @@ -43,7 +43,7 @@ /** * Creates a new Transition using the Configuration that is provided by the * XML-Node. - * @param configuration The configuration that should be used to initialize + * @param configuration The configuration that should be used to initialize * the new Transition * @return a new Transition. */ diff -r 520a3b4da484 -r 2423cefe7d39 gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Fri Apr 16 11:45:36 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Sat Apr 17 09:35:24 2010 +0000 @@ -30,7 +30,7 @@ private static final long serialVersionUID = -7846722158776823205L; /** - * The Name of the Datafield the Value that should be compared + * The Name of the Datafield the Value that should be compared * should be fetched from. */ private String dataName = null; @@ -83,7 +83,7 @@ return false; } - + @Override public void setup(Node configuration) { super.setup(configuration);