Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java @ 870:dfd02f8d3602
Removed trailing whitespace.
gnv-artifacts/trunk@1010 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 28 Apr 2010 06:53:44 +0000 |
parents | 3fbabd4803d7 |
children | 461d4489705c |
line wrap: on
line diff
--- 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);