Mercurial > dive4elements > gnv-client
changeset 870:dfd02f8d3602
Removed trailing whitespace.
gnv-artifacts/trunk@1010 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/ChangeLog Wed Apr 28 06:53:44 2010 +0000 @@ -1,3 +1,17 @@ +2010-04-28 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * src/main/java/de/intevation/gnv/state/cache/ThematicDataCacheCleaner.java, + src/main/java/de/intevation/gnv/state/layer/LayerMetaData.java, + src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java, + src/main/java/de/intevation/gnv/state/StateBase.java, + src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java, + src/main/java/de/intevation/gnv/statistics/Statistic.java, + src/main/java/de/intevation/gnv/statistics/Statistics.java, + src/main/java/de/intevation/gnv/utils/MetaWriter.java, + src/main/java/de/intevation/gnv/chart/ChartLabels.java, + src/main/java/de/intevation/gnv/exports/VerticalCrossODVExport.java: + Removed trailing whitespace. + 2010-04-28 Ingo Weinzierl <ingo.weinzierl@intevation.de> * src/main/java/de/intevation/gnv/exports/VerticalCrossODVExport.java:
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/ChartLabels.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/ChartLabels.java Wed Apr 28 06:53:44 2010 +0000 @@ -32,7 +32,7 @@ private String subtitle; /** - * + * */ private String domainAxisLabel; @@ -49,7 +49,7 @@ /** * Constructor - * + * * @param title Title * @param subtitle Subtitle * @param domainAxisLabel X-axis label
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/VerticalCrossODVExport.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/VerticalCrossODVExport.java Wed Apr 28 06:53:44 2010 +0000 @@ -107,7 +107,7 @@ /** - * + * * @param profile The Profile used to create column headers. * @param outputStream The stream where the odv data are written to. * @param result Not used here, might be null.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Wed Apr 28 06:53:44 2010 +0000 @@ -82,7 +82,7 @@ public static final String EXCEPTION_INVALID_INPUT = "input.is.not.valid"; - + public final static String HASH_ID_SEPARATOR = "#"; /** input value names which should not be rendered from State itself */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/cache/ThematicDataCacheCleaner.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/cache/ThematicDataCacheCleaner.java Wed Apr 28 06:53:44 2010 +0000 @@ -38,8 +38,8 @@ * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(ThematicDataCacheCleaner.class); - - private final static String XPATH_ARTIFACTS = + + private final static String XPATH_ARTIFACTS = "/artifact-database/artifacts/artifact"; private final static String XPATH_STATES = "states/state"; private final static String XPATH_STATEID = "id"; @@ -141,7 +141,7 @@ if (artifactList != null && artifactList.getLength() > 0){ for (int i = 0; i < artifactList.getLength(); i++){ Element currentArtifactNode = (Element)artifactList.item(i); - + String link = currentArtifactNode.getAttribute("xlink:href"); if (link != null && link.length() > 0){ String absolutFileName = Config.replaceConfigDir(link); @@ -155,7 +155,7 @@ Element currentStateNode = (Element)stateList.item(j); String stateId = currentStateNode .getAttribute(XPATH_STATEID); - String queryID = Config.getStringXPath(currentStateNode, + String queryID = Config.getStringXPath(currentStateNode, XPATH_QUERYID); try { if (queryID != null){ @@ -215,7 +215,7 @@ Cache cache = factory.getCache(); List<String> keys = cache.getKeys(); String keySample = StateBase.HASH_ID_SEPARATOR + - stateId + + stateId + StateBase.HASH_ID_SEPARATOR; if (keys != null && keys.size() > 0){ Iterator<String> it = keys.iterator(); @@ -224,10 +224,10 @@ if (key != null && key.contains(keySample)){ boolean removed = cache.remove(key); if (!removed){ - log.warn("Object with Key " + + log.warn("Object with Key " + key + "could not be removed from Cache"); }else{ - log.debug("Object with Key " + + log.debug("Object with Key " + key + "has been removed from Cache"); } }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerMetaData.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerMetaData.java Wed Apr 28 06:53:44 2010 +0000 @@ -31,7 +31,7 @@ * @param geometryWKT The Geometry represented by as an WKT to Query the Data. */ public LayerMetaData(String table, String geometryType, String where, - String columns, String templateID, + String columns, String templateID, String[] queryValues,String geometryWKT) { super(); this.table = table;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Wed Apr 28 06:53:44 2010 +0000 @@ -113,8 +113,8 @@ String outputMode = XMLUtils.xpathString( format, XPATH_OUTPUT_MODE, ArtifactNamespaceContext.INSTANCE); if (outputMode.equalsIgnoreCase("wms")) { - - Collection<LayerMetaData> layerMetaData = + + Collection<LayerMetaData> layerMetaData = this.getRequestedLayerMetadata(); if (layerMetaData != null && !layerMetaData.isEmpty()){ XMLUtils.toStream(this.getWMS(uuid, callContext, @@ -124,11 +124,11 @@ this.writeExceptionReport2Stream(outputStream); } }else if (outputMode.equalsIgnoreCase("zip")){ - Collection<LayerMetaData> layerMetaData = + Collection<LayerMetaData> layerMetaData = this.getRequestedLayerMetadata(); if (layerMetaData != null && !layerMetaData.isEmpty()){ - this.writeZip(uuid, callContext, + this.writeZip(uuid, callContext, outputStream, layerMetaData); }else{ this.writeExceptionReport2Stream(outputStream); @@ -150,7 +150,7 @@ } /** - * Returns the Metadata for the requested Layers for fetching the data + * Returns the Metadata for the requested Layers for fetching the data * of the Layer and generating the Layer and WMS. * @return the Metadata for the requested Layers */ @@ -177,7 +177,7 @@ this.inputData.get(this.geometryID); if (geometryInputData != null){ try { - + Collection<Result> geometryData = queryExecutor .executeQuery(this.geometryQueryID, new String[]{geometryInputData.getValue()}); @@ -221,8 +221,8 @@ queryValues = new String[]{columns,table,where}; } } - returnValue.add(new LayerMetaData(table, geometryType, - where, columns, + returnValue.add(new LayerMetaData(table, geometryType, + where, columns, templateID, queryValues, geometryWKT)); } @@ -420,7 +420,7 @@ * in it. If it not exists the Director will be created. * @param baseDir the BaseDirectory for all ShapeDirs * @param uuid the UUID which is used to create the Directory - * @return true if the directory exists or could be created. + * @return true if the directory exists or could be created. * false if the directory could not be created. */ private boolean createShapeDir(File baseDir, String uuid){ @@ -584,7 +584,7 @@ { String path = getShapeFilePath(); if (path != null && new File(path).isDirectory()){ - return this.refreshMetaFile(layerMetaData, inputData, + return this.refreshMetaFile(layerMetaData, inputData, uuid, callContext); }else{ Document document = XMLUtils.newDocument(); @@ -620,8 +620,8 @@ if (meta == null){ meta = MetaWriter.writeLayerMeta(callContext,document); } - MetaWriter.writeLayerMeta(callContext, document, - meta, uuid, paramType, + MetaWriter.writeLayerMeta(callContext, document, + meta, uuid, paramType, this.determineGeometryType(geometryType), createShapeFileName(layerNumber), title); @@ -686,8 +686,8 @@ if (meta == null){ meta = MetaWriter.writeLayerMeta(callContext,document); } - MetaWriter.writeLayerMeta(callContext, document, - meta, uuid, paramType, + MetaWriter.writeLayerMeta(callContext, document, + meta, uuid, paramType, this.determineGeometryType(geometryType), createShapeFileName(layerNumber), title);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistic.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistic.java Wed Apr 28 06:53:44 2010 +0000 @@ -19,7 +19,7 @@ /** * This class stores a double value with a specific key. - * + * * @author blume */ public class Statistic {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/Statistics.java Wed Apr 28 06:53:44 2010 +0000 @@ -24,14 +24,14 @@ /** * This interface defines one single method to calculate a statistic for a * given data set. - * + * * @author blume */ public interface Statistics { /** * This method takes a data set and creates a statistic from it. - * + * * @param resultSet The resulting statistic is about this data set. * @param parameters A collection of parameters. * @param measurements A collection of measurements.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Wed Apr 28 06:53:44 2010 +0000 @@ -36,10 +36,10 @@ /** * This class is used to create a statistic in timeseries products. - * + * * @author blume */ -public class TimeseriesStatistics +public class TimeseriesStatistics extends AbstractStatistics { @@ -115,19 +115,19 @@ || !break3.equals(row.getString(b3Idx)) ) { String statisticsName = generateStatisticsName( - break1, break2, - break3, parameters, + break1, break2, + break3, parameters, measurements, dates); statisticSets.add( generateStatisticsValues( - lStatistics, + lStatistics, lRegression, statisticsName)); lStatistics.clear(); lRegression.clear(); - + clearStatistics(); Double yValue = row.getDouble(yIdx); @@ -165,15 +165,15 @@ Double x = calculateXOrdinateValue(previousRow, row); lRegression.addData(x, yValue); } - + String statisticsName = generateStatisticsName( - break1, break2, - break3, parameters, + break1, break2, + break3, parameters, measurements, dates); - + statisticSets.add(generateStatisticsValues( - lStatistics, - lRegression, + lStatistics, + lRegression, statisticsName)); lStatistics.clear(); lRegression.clear(); @@ -189,9 +189,9 @@ * Nothing is done here. */ protected void clearStatistics(){} - - protected String generateStatisticsName(String break1, + + protected String generateStatisticsName(String break1, String break2, String break3, Collection<KeyValueDescibeData> parameters, @@ -201,8 +201,8 @@ return this.findValueTitle(parameters,break1)+ " "+ this.findValueTitle(measurements,break2) + "m"; } - - + + protected String findValueTitle(Collection<KeyValueDescibeData> values, String id) { log.debug("TimeseriesStatistics.findValueTitle "+ id); @@ -218,7 +218,7 @@ return ""; } - + protected double calculateXOrdinateValue(Result previousRow, Result row) throws SQLException { return new Double((row.getDate("XORDINATE")).getTime() / 1000 / 3600); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Wed Apr 28 06:53:44 2010 +0000 @@ -244,7 +244,7 @@ status.setTextContent("OFF"); data.setTextContent(shapefileName); timeToLive.setTextContent(ttl); - + title.setTextContent(layerTitle); layer.appendChild(model);