Mercurial > dive4elements > gnv-client
changeset 778:9a828e5a2390
Removed trailing whitespace
gnv-artifacts/trunk@851 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/ChangeLog Mon Mar 29 07:58:51 2010 +0000 @@ -1,3 +1,10 @@ +2010-03-29 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * 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]\+$//' + 2010-03-26 Tim Englich <tim.englich@intevation.de> * doc/conf/queries.properties: @@ -18,9 +25,9 @@ * src/main/java/de/intevation/gnv/utils/ExclusiveExec.java: New. This class can be used to synchronize threads with a given key. To use this synchronization, you just have to do something like the following: - UniqueKey token = ExclusiveExec.INSTANCE.acquire(key); - // your code to be synchronized - ExclusiveExec.INSTANCE.release(token); + UniqueKey token = ExclusiveExec.INSTANCE.acquire(key); + // your code to be synchronized + ExclusiveExec.INSTANCE.release(token); A thread needs to wait if there is already a thread with the given key which has acquired a token. Threads with a different key don't need to wait for this thread.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/APP.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/APP.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class APP {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Mon Mar 29 07:58:51 2010 +0000 @@ -49,7 +49,7 @@ * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */ -public abstract class GNVArtifactBase extends GNVDefaultArtifact +public abstract class GNVArtifactBase extends GNVDefaultArtifact implements PreSettingArtifact { /** @@ -81,9 +81,9 @@ public static final String XPATH_TARGET_NAME = "/art:action/art:target/@name"; - public static final String XPATH_OUTPUT_NAME = "/art:action/art:out/@name"; + public static final String XPATH_OUTPUT_NAME = "/art:action/art:out/@name"; - public static final String XPATH_OUTPUT_PARAMS = "/art:action/art:out/art:params/art:input"; + public static final String XPATH_OUTPUT_PARAMS = "/art:action/art:out/art:params/art:input"; public static final String INITIAL_STATE = "product"; @@ -96,7 +96,7 @@ * The States that can be used */ protected Map<String, State> states = null; - + /** * The Transitions which can switch between the different States. */ @@ -160,14 +160,14 @@ next = states.get(targetState); boolean success = go2NextState(context, result, next); - + if (success){ result = createReport( result, "result", "success", "Advance success" ); }else{ result = ArtifactXMLUtilities. - createExceptionReport("Error while going to next State.", + createExceptionReport("Error while going to next State.", XMLUtils.newDocument()); } } @@ -309,12 +309,12 @@ } return false; } - + public Document initialize (CallContext context) { Document result = XMLUtils.newDocument(); try { this.current.initialize(super.identifier, context); - + if (this.current instanceof AutoResumeState){ // Jump to next State using the Transitions. State next = this.getNextReachableState(this.current); @@ -327,12 +327,12 @@ }else{ result = ArtifactXMLUtilities. createExceptionReport( - "Error while going to next State.", + "Error while going to next State.", XMLUtils.newDocument()); } }else{ result = ArtifactXMLUtilities. - createExceptionReport("No propper State found.", + createExceptionReport("No propper State found.", XMLUtils.newDocument()); } }else{ @@ -347,7 +347,7 @@ } return result; } - + protected State getNextReachableState(State current){ Iterator<Transition> it = this.transitions.iterator(); String from = current.getID(); @@ -372,15 +372,15 @@ log.debug("GNVArtifactBase.getConfigurationFragment"); String xpathQuery = XPATH_ARTIFACT_CONFIGURATION.replaceAll( XPATH_IDENTIFIER_REPLACE, this.name); - + Element configurationNode = (Element)Config.getNodeXPath(document, xpathQuery); - + String link = configurationNode.getAttribute("xlink:href"); if (link != null ){ String absolutFileName = Config.replaceConfigDir(link); configurationNode = (Element)new ArtifactXMLUtilities().readConfiguration(absolutFileName); } - + return configurationNode; } @@ -451,7 +451,7 @@ * @see de.intevation.artifactdatabase.DefaultArtifact#setup(java.lang.String, de.intevation.artifacts.ArtifactFactory, java.lang.Object, org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context,Document data) { log.debug("GNVArtifactBase.setup"); super.setup(identifier, factory, context, data); @@ -466,7 +466,7 @@ GNVArtifactContext gnvContext = (GNVArtifactContext) localContext; Document doc = gnvContext.getConfig(); Node artifactNode = this.getConfigurationFragment(doc); - + NodeList stateList = Config.getNodeSetXPath(artifactNode, "states/state"); this.states = new HashMap<String, State>(stateList @@ -482,7 +482,7 @@ } } } - + NodeList transitionList = Config.getNodeSetXPath(artifactNode, "states/transition"); this.transitions = new ArrayList<Transition>(transitionList.getLength()); @@ -523,7 +523,7 @@ return document; } - + protected boolean getIncludeUIFromDocument(Document document){ String value = XMLUtils.xpathString( document, XPATH_INCLUDE_UI, ArtifactNamespaceContext.INSTANCE); @@ -871,14 +871,14 @@ current.endOfLife(globalContext); } } - + /** * @see de.intevation.gnv.artifacts.PreSettingArtifact#getPreSettings() */ public Map<String, InputData> getPreSettings() { return this.preSettings; } - + /** * @see de.intevation.gnv.artifacts.PreSettingArtifact#setPreSettings(java.util.Map) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/PreSettingArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -13,8 +13,8 @@ */ public interface PreSettingArtifact { - + Map<String,InputData> getPreSettings(); - + void setPreSettings(Map<String,InputData> preSettings); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/cache/CacheFactory.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,7 +10,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class CacheFactory { @@ -27,7 +27,7 @@ private static CacheFactory instance = null; /** - * + * */ private CacheManager cacheManager = null; @@ -40,7 +40,7 @@ /** * This Method provides an singleton Instance of this Class. - * + * * @return an singleton Instance of this Class */ public static CacheFactory getInstance() { @@ -52,7 +52,7 @@ /** * Getting the ConnectionPool - * + * * @return the ConnectionPool */ public Cache getCache() { @@ -62,7 +62,7 @@ /** * Initializes the ConnectionPool. Should only be called once on system * startup - * + * * @param properties * the Properties for the Individual Configuration of the * ConnectionPool @@ -76,7 +76,7 @@ /** * Checks if the ConnectionPool has already been initialized. - * + * * @return true if the ConnectionPool is initialized. */ public boolean isInitialized() {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContext.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ * @author Tim Englich (tim.englich@intevation.de) * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */ -public class GNVArtifactContext +public class GNVArtifactContext extends DefaultArtifactContext { /** @@ -32,7 +32,7 @@ public static final String HORIZONTAL_CROSS_SECTION_PROFILE_SAMPLES_KEY = "gnv.horizontal.cross.section.profile.samples"; - + public static final String HORIZONTAL_CROSS_SECTION_SAMPLES_KEY = "gnv.horizontal.cross.section.samples"; @@ -44,16 +44,16 @@ "gnv.horizontal.cross.section.result.shapefile"; public static final File - DEFAULT_HORIZONTAL_CROSS_SECTION_PROFILE_SHAPEFILE_PATH = + DEFAULT_HORIZONTAL_CROSS_SECTION_PROFILE_SHAPEFILE_PATH = new File(System.getProperty("java.io.tmpdir")); - public static final Integer + public static final Integer DEFAULT_HORIZONTAL_CROSS_SECTION_PROFILE_SAMPLES = Integer.valueOf(250); - - public static final Integer + + public static final Integer DEFAULT_HORIZONTAL_CROSS_SECTION_SAMPLES = Integer.valueOf(1024); - public static final Integer + public static final Integer DEFAULT_HORIZONTAL_CROSS_SECTION_EXTRAPOLATION_ROUNDS = Integer.valueOf(0); public static final String HORIZONTAL_CROSS_SECTION_GROUND_INTERPOLATION_KEY =
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java Mon Mar 29 07:58:51 2010 +0000 @@ -51,16 +51,16 @@ */ private static Logger log = Logger.getLogger(GNVArtifactContext.class); - public static final String XPATH_GEOBACKEND_CONFIGURATION = + public static final String XPATH_GEOBACKEND_CONFIGURATION = "artifact-database/geo-backend/backend-configuration"; - public static final String XPATH_GEOBACKEND_QUERYCONFIGURATION = + public static final String XPATH_GEOBACKEND_QUERYCONFIGURATION = "artifact-database/geo-backend/query-configuration"; - private final static String CACHECONFIGNODEPATH = + private final static String CACHECONFIGNODEPATH = "/artifact-database/ehcache/configuration"; - private final static String CHARTCONFIGNODEPATH = + private final static String CHARTCONFIGNODEPATH = "/artifact-database/gnv/charttemplate/configuration"; public final static String PALETTES_PATH = @@ -77,13 +77,13 @@ public final static String HORIZONTAL_CROSS_SECTION_SAMPLES = "/artifact-database/gnv/horizontal-cross-section/samples/@number"; - + public final static String HORIZONTAL_CROSS_SECTION_EXTRAPOLATION_ROUNDS = "/artifact-database/gnv/horizontal-cross-section/extrapolation/@rounds"; - + public final static String HORIZONTAL_CROSS_SECTION_RESULT_SHAPEFILE_PATH = "/artifact-database/gnv/shapefile-directory/@path"; - + public final static String VERTICAL_CROSS_SECTION_SAMPLES = "/artifact-database/gnv/vertical-cross-section/samples"; @@ -232,7 +232,7 @@ config, VERTICAL_CROSS_SECTION_GROUND_INTERPOLATION); - if (interpolation == null + if (interpolation == null || (interpolation = interpolation.trim()).length() == 0) { interpolation = GNVArtifactContext .DEFAULT_VERTICAL_CROSS_SECTION_GROUND_INTERPOLATION; @@ -333,7 +333,7 @@ } } } - log.info("samples (width x height): " + + log.info("samples (width x height): " + sampleSize.width + " x " + sampleSize.height); context.put( @@ -374,7 +374,7 @@ GNVArtifactContext.HORIZONTAL_CROSS_SECTION_PROFILE_SAMPLES_KEY, samples); } - + protected void configureHorizontalCrossSection( Document config, GNVArtifactContext context @@ -435,7 +435,7 @@ config, HORIZONTAL_CROSS_SECTION_GROUND_INTERPOLATION); - if (interpolation == null + if (interpolation == null || (interpolation = interpolation.trim()).length() == 0) { interpolation = GNVArtifactContext .DEFAULT_HORIZONTAL_CROSS_SECTION_GROUND_INTERPOLATION; @@ -457,7 +457,7 @@ log.info( "configuration of horizontal cross section result shape file path"); - File dir = + File dir = GNVArtifactContext. DEFAULT_HORIZONTAL_CROSS_SECTION_PROFILE_SHAPEFILE_PATH; @@ -472,7 +472,7 @@ log.warn("No 'result-shapefile-directory' given"); } - log.info("writing shape files to '" + log.info("writing shape files to '" + dir.getAbsolutePath() + "'"); context.put( @@ -575,7 +575,7 @@ || (filename = filename.trim()).length() == 0) { log.error("Palette '" + name + "' has no 'file' attribute."); } - else if (parameterIds == null + else if (parameterIds == null || (parameterIds = parameterIds.trim()).length() == 0) { log.error("no parameter ids given for '" + name + "'"); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/SelectProductArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -48,8 +48,8 @@ public static final String XPATH_INPUT_DATA_VALUE = "art:action/art:data/art:input[@name='product']/@value"; - - public static final String XPATH_SETUP_PARAMETER_NODES = + + public static final String XPATH_SETUP_PARAMETER_NODES = "/art:action/art:factory/art:parameter"; public static final String XFORM_URL = "http://www.w3.org/2002/xforms"; @@ -61,7 +61,7 @@ private Product current; private Artifact artifact; private String name; - + private Map<String, InputData> preSettings = null; public SelectProductArtifact() { @@ -78,10 +78,10 @@ log.debug("SelectProductArtifact.setup()"); super.setup(identifier, factory, context,data); this.name = factory.getName(); - + // Read the Parameters that should be used for the setup from the // Data-XML.Document. - NodeList parameterNodes = (NodeList) XMLUtils.xpath(data, + NodeList parameterNodes = (NodeList) XMLUtils.xpath(data, XPATH_SETUP_PARAMETER_NODES, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE); @@ -102,7 +102,7 @@ } } } - + } @@ -206,11 +206,11 @@ .getArtifactFactoryByName(current.getName()); artifact = factory.createArtifact(uuid, context, null); - + if (this.preSettings != null && artifact instanceof PreSettingArtifact){ ((PreSettingArtifact)artifact).setPreSettings(this.preSettings); } - + artifact.feed(feedDocument(uuid, hash), context); result = ((GNVArtifactBase) artifact).initialize(context);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/DefaultProduct.java Mon Mar 29 07:58:51 2010 +0000 @@ -9,7 +9,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultProduct implements Product { @@ -26,7 +26,7 @@ /** * Constructor - * + * * @param name * @param parameter * @param artifactFactory
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/product/Product.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface Product extends Serializable {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/ressource/RessourceFactory.java Mon Mar 29 07:58:51 2010 +0000 @@ -21,7 +21,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class RessourceFactory { @@ -55,7 +55,7 @@ /** * This Method provides an singleton Instance of this Class. - * + * * @return an singleton Instance of this Class */ public static synchronized RessourceFactory getInstance() { @@ -132,7 +132,7 @@ /** * Deliveres the translated Value for an Key to an given Language - * + * * @param locale * The choosen locale * @param key
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/MetaDataService.java Mon Mar 29 07:58:51 2010 +0000 @@ -49,17 +49,17 @@ */ private static Logger log = Logger.getLogger(MetaDataService.class); - - private final static String FIS_REGION_QUERY_ID = + + private final static String FIS_REGION_QUERY_ID = "mapviewer_interface_fis_region"; - private final static String MAPSERVICES_HAS_FIS_QUERY_ID = + private final static String MAPSERVICES_HAS_FIS_QUERY_ID = "mapviewer_interface_mapservices_has_fis"; - private final static String MAPSERVICES_HAS_PARAMETER_QUERY_ID = + private final static String MAPSERVICES_HAS_PARAMETER_QUERY_ID = "mapviewer_interface_mapservices_has_parameter"; - - private final static String MAPSERVICES_HAS_PARAMETER_USING_LAYER_QUERY_ID = + + private final static String MAPSERVICES_HAS_PARAMETER_USING_LAYER_QUERY_ID = "mapviewer_interface_mapservices_has_parameter_using_layer"; - + private static String ATTRIBUTE_ID = "id"; private static String ATTRIBUTE_NAME = "name"; private static String ATTRIBUTE_TYPE = "type"; @@ -67,14 +67,14 @@ private static String ATTRIBUTE_GROUPLAYER = "isgrouplayer"; private static String ATTRIBUTE_PARENTID = "parentid"; private static String ATTRIBUTE_SRS = "srs"; - - + + private static String XPATH_LOACTION_NODE = "art:GetMetaData/art:location"; private static String XPATH_MAPSERVICES_NODESET = "art:GetMetaData/" + "art:mapservices/" + "art:mapservice"; private static String XPATH_LAYER_NODESET = "art:layer"; - + /** * The UID of this Class. */ @@ -98,7 +98,7 @@ try { Geometry g = this.parseGeometry(data); Collection<MapService> mapServices = this.parseMapServices(data); - Collection<FIS> resultFIS = this.unionFIS(this.getFIS(g), + Collection<FIS> resultFIS = this.unionFIS(this.getFIS(g), this.getFIS(mapServices)); document = XMLUtils.newDocument(); this.writeFIS2Document(document, resultFIS); @@ -110,11 +110,11 @@ } return document; } - - private Geometry parseGeometry(Document data) + + private Geometry parseGeometry(Document data) throws MetaDataServiceException{ log.debug("MetaDataService.parseGeometry"); - + Element locationNode = (Element) XMLUtils.xpath( data, XPATH_LOACTION_NODE, @@ -139,11 +139,11 @@ } return returnValue; } - + private Collection<MapService> parseMapServices(Document data){ log.debug("MetaDataService.parseMapServices"); - - NodeList mapServices = (NodeList) XMLUtils.xpath(data, + + NodeList mapServices = (NodeList) XMLUtils.xpath(data, XPATH_MAPSERVICES_NODESET, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE); @@ -156,8 +156,8 @@ String type = mapServiceNode.getAttribute(ATTRIBUTE_TYPE); String url = mapServiceNode.getAttribute(ATTRIBUTE_URL); Collection<Layer> layer = null; - - NodeList layerNodes = (NodeList) XMLUtils.xpath(mapServiceNode, + + NodeList layerNodes = (NodeList) XMLUtils.xpath(mapServiceNode, XPATH_LAYER_NODESET, XPathConstants.NODESET, ArtifactNamespaceContext.INSTANCE); @@ -167,29 +167,29 @@ Element layerNode = (Element)layerNodes.item(j); String layerId = layerNode.getAttribute(ATTRIBUTE_ID); String layerName = layerNode.getAttribute(ATTRIBUTE_NAME); - boolean isGroupLayer = + boolean isGroupLayer = Boolean.parseBoolean(layerNode .getAttribute( ATTRIBUTE_GROUPLAYER)); String parentId = layerNode .getAttribute(ATTRIBUTE_PARENTID); - + layer.add(new DefaultLayer(layerId, layerName, isGroupLayer, parentId)); } } - MapService mapService = new DefaultMapService(id, layer, + MapService mapService = new DefaultMapService(id, layer, type, url); returnValue.add(mapService); - + } } return returnValue; } - - private Collection<FIS> unionFIS(Collection<FIS> fromGeometry, + + private Collection<FIS> unionFIS(Collection<FIS> fromGeometry, Collection<FIS> fromMapservices){ log.debug("MetaDataService.unionFIS"); Collection<FIS> returnValue = null; @@ -198,7 +198,7 @@ }else if (fromMapservices == null || fromMapservices.isEmpty()){ returnValue = fromGeometry; }else{ - + returnValue = new ArrayList<FIS>(); Iterator<FIS> it = fromMapservices.iterator(); while (it.hasNext()){ @@ -210,15 +210,15 @@ } return returnValue; } - + /** * Puts the retrieved FIS into the given XML-Document. * @param document the Document where the FIS should be put in. - * @param fis the retrieved FIS which should be written into + * @param fis the retrieved FIS which should be written into * the XML-Document. */ private void writeFIS2Document(Document document, Collection<FIS> fis){ - + if (fis != null){ Iterator<FIS> it = fis.iterator(); XMLUtils.ElementCreator creator = new XMLUtils.ElementCreator( @@ -228,16 +228,16 @@ ); Node rootNode = creator.create("result"); document.appendChild(rootNode); - + Node factoriesNode = creator.create("factories"); rootNode.appendChild(factoriesNode); while (it.hasNext()){ FIS tmpFIS = it.next(); Element fisNode = creator.create("factory"); fisNode.setAttribute("art:name",tmpFIS.getID()); - + Collection<Parameter> parameter = tmpFIS.getParameter(); - + if(parameter != null){ Iterator<Parameter> pit = parameter.iterator(); while (pit.hasNext()){ @@ -252,13 +252,13 @@ } } } - + /** * Returns all FIS which Areas is intersected by this given Geometry * @param g the Geometry which should be used to determine the FIS. * @return all FIS which Areas is intersected by this given Geometry */ - protected Collection<FIS> getFIS(Geometry g) + protected Collection<FIS> getFIS(Geometry g) throws MetaDataServiceException{ log.debug("MetaDataService.getFIS ==> Geometry"); Collection<FIS> resultValue = null; @@ -269,7 +269,7 @@ .getQueryExecutor(); Collection<Result> result = queryExecutor.executeQuery(FIS_REGION_QUERY_ID, new String[]{g.toString()}); - + if (result != null){ resultValue = new ArrayList<FIS>(result.size()); Iterator<Result> it = result.iterator(); @@ -286,7 +286,7 @@ } return resultValue; } - + /** * Returns all FIS which were represented by the given Mapservices * @param mapServices the Mapservices which should determine the FIS. @@ -298,16 +298,16 @@ Collection<FIS> resultValue = null; if (mapServices != null && !mapServices.isEmpty()){ try { - + String mapServiceNames = ""; - Iterator<MapService> mit = mapServices.iterator(); + Iterator<MapService> mit = mapServices.iterator(); while(mit.hasNext()){ if (mapServiceNames.length() > 0){ mapServiceNames += " , "; } mapServiceNames += "'"+mit.next().getID()+"'"; } - + QueryExecutor queryExecutor = QueryExecutorFactory .getInstance() .getQueryExecutor(); @@ -321,7 +321,7 @@ Result value = it.next(); String fisId = value.getString(0).trim(); String mapServiceID = value.getString(1).trim(); - + // FIRST LOOK IF ONE MAPSERVICE REPRESENTS ONLY ONE PARAM Collection<Result> result2 = queryExecutor.executeQuery( MAPSERVICES_HAS_PARAMETER_QUERY_ID, @@ -334,7 +334,7 @@ Result parameterValue = it2.next(); String parameterID = parameterValue.getString(0) .trim(); - parameter.add(new DefaultParameter(parameterID, + parameter.add(new DefaultParameter(parameterID, parameterID)); } }else{ @@ -344,14 +344,14 @@ mapServiceID); Collection<Layer> layer = service.getLayer(); if (layer != null && !layer.isEmpty()){ - String layerQueryString = + String layerQueryString = this.createLayerQueryString(layer); - Collection<Result> parameterResult = + Collection<Result> parameterResult = queryExecutor.executeQuery( MAPSERVICES_HAS_PARAMETER_USING_LAYER_QUERY_ID, new String[]{"'"+mapServiceID+"'", layerQueryString}); - if (parameterResult != null && + if (parameterResult != null && !parameterResult.isEmpty()){ Iterator<Result> it2 = parameterResult.iterator(); parameter = new ArrayList<Parameter>(parameterResult.size()); @@ -359,14 +359,14 @@ Result parameterValue = it2.next(); String parameterID = parameterValue.getString(0) .trim(); - parameter.add(new DefaultParameter(parameterID, + parameter.add(new DefaultParameter(parameterID, parameterID)); } } } - + } - + FIS fis = this.getFIS(resultValue, fisId); if (fis != null){ if (parameter != null){ @@ -381,14 +381,14 @@ log.error(e,e); throw new MetaDataServiceException("Cannot Query FIS from DB."); } - + } return resultValue; } - - + + private FIS getFIS (Collection<FIS> fis, String fisId){ - + Iterator<FIS> it = fis.iterator(); while(it.hasNext()){ FIS tmpFIS = it.next(); @@ -398,7 +398,7 @@ } return null; } - + private MapService getMapService(Collection<MapService> mapServices, String mapServiceID){ log.debug("MetaDataService.getMapService"); @@ -411,7 +411,7 @@ } return null; } - + private String createLayerQueryString(Collection<Layer> layer){ log.debug("MetaDataService.createLayerQueryString"); StringBuffer sb = new StringBuffer();; @@ -425,7 +425,7 @@ sb.append(" , "); } } - + } } String returnValue = sb.toString();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultFIS.java Mon Mar 29 07:58:51 2010 +0000 @@ -12,9 +12,9 @@ */ public class DefaultFIS implements FIS { - + private String id = null; - + private Collection<Parameter> parameter = null; public DefaultFIS(String id){ @@ -69,7 +69,7 @@ this.parameter = parameter; } } - - + + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultLayer.java Mon Mar 29 07:58:51 2010 +0000 @@ -8,13 +8,13 @@ */ public class DefaultLayer implements Layer { - + private String id = null; - + private String name = null; - + private boolean groupLayer = false; - + private String parentId = null; /** * Constructor @@ -56,7 +56,7 @@ public String parentID() { return this.parentId; } - + @Override public String toString() { return "ID: "+ this.id + " Name: "+this.name+
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultMapService.java Mon Mar 29 07:58:51 2010 +0000 @@ -12,18 +12,18 @@ public class DefaultMapService implements MapService { private String id = null; - + private Collection<Layer> layer = null; - + private String type = null; - + private String url = null; /** * Constructor */ - public DefaultMapService(String id, Collection<Layer> layer, + public DefaultMapService(String id, Collection<Layer> layer, String type, String url) { super(); this.id = id;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/DefaultParameter.java Mon Mar 29 07:58:51 2010 +0000 @@ -8,11 +8,11 @@ */ public class DefaultParameter implements Parameter { - + private String id = null; - + private String name = null; - + /** * Constructor * @param id
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/FIS.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,7 +10,7 @@ * */ public interface FIS { - + String getID(); Collection<Parameter> getParameter(); void addParameter(Collection<Parameter> parameter);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Layer.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ * */ public interface Layer { - + String getName(); String getID(); boolean isGroupLayer();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/MapService.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,14 +10,14 @@ * */ public interface MapService { - - + + String getID(); - + String getURL(); - + String getType(); - + Collection<Layer> getLayer(); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/services/requestobjects/Parameter.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ * */ public interface Parameter { - + String getName(); String getID ();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/AbstractXYLineChart.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/AbstractXYLineChart.java Mon Mar 29 07:58:51 2010 +0000 @@ -272,7 +272,7 @@ /** - * Method to adjust the plot rendering. Disable horizontal grid lines if + * Method to adjust the plot rendering. Disable horizontal grid lines if * <code>plot</code> contains only a single y-axis. * * @param plot JFreeChart Plot object to be adjusted. @@ -284,7 +284,7 @@ /** - * Abstract method which is called after chart creation. It turns an + * Abstract method which is called after chart creation. It turns an * axis' label into a locale specific format. * * @param axis Axis to adjust.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/Chart.java Mon Mar 29 07:58:51 2010 +0000 @@ -6,8 +6,8 @@ /** - * The <code>Chart</code> interface should be implemented by each type of chart. - * The class must implement a method <code>generateChart</code> which returns a + * The <code>Chart</code> interface should be implemented by each type of chart. + * The class must implement a method <code>generateChart</code> which returns a * JFreeChart object. * * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/DefaultHistogram.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/DefaultHistogram.java Mon Mar 29 07:58:51 2010 +0000 @@ -56,7 +56,7 @@ public static final String REQUEST_KEY_LOCALE = "locale"; /** - * Default key to retrieve the object from {@link #requestParameter}. It + * Default key to retrieve the object from {@link #requestParameter}. It * defines which value this chart has to be used for bin calculation. You * can either adjust the number of bins or the width of a single bin. */ @@ -176,7 +176,7 @@ /** * Method to retrieve the number of bins. If {@link #requestParameter} * contains a valid <code>Integer</code> at - * <code>REQUEST_KEY_BIN_COUNT</code> and this is smaller than or equal + * <code>REQUEST_KEY_BIN_COUNT</code> and this is smaller than or equal * {@link #MAXIMAL_BINS}, this value is used. If no valid * <code>Integer</code> is given or if the value in {@link #requestParameter} * is bigger than {@link #MAXIMAL_BINS}, {@link #DEFAULT_BINS} is used.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java Mon Mar 29 07:58:51 2010 +0000 @@ -353,9 +353,9 @@ /** - * Simple method to detect gaps. A gap is detected if the delta between two - * data points (current, last) is bigger than <code>PERCENTAGE</code> percent - * of delta of start and end. + * Simple method to detect gaps. A gap is detected if the delta between two + * data points (current, last) is bigger than <code>PERCENTAGE</code> percent + * of delta of start and end. * <br> * (smallDelta > delta / 100 * PERCENTAGE) *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/TimeSeriesChart.java Mon Mar 29 07:58:51 2010 +0000 @@ -301,7 +301,7 @@ TimeZone zone, Locale locale) { - /* + /* * This method have been copied from JFreeChart's DateAxis class. * DateFormat objects are hard coded in DateAxis and cannot be adjusted. */ @@ -458,7 +458,7 @@ /** - * Method to add gaps between two data points. The max valid space between + * Method to add gaps between two data points. The max valid space between * two data points is calculated by <code>calculateGapSize</code>. * * @param results All data points in this dataset. @@ -550,7 +550,7 @@ * * @param dStart Start date * @param dEnd End date - * @param pStart Index of start point in series used to specify the total + * @param pStart Index of start point in series used to specify the total * amount of date items. * @param pEnd Index of end point in series used to specify the total amount * of date items.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalCrossSectionChart.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalCrossSectionChart.java Mon Mar 29 07:58:51 2010 +0000 @@ -75,7 +75,7 @@ * @param special See {@link #special} */ public PalettePaintLookup( - Palette palette, + Palette palette, Map<Integer, Paint> special ) { this.palette = palette; @@ -101,7 +101,7 @@ } // class PalettePaintLookup /** - * This class is used to turn labels which represent a number into a + * This class is used to turn labels which represent a number into a * specific format. */ public static class LocalizedLabelGenerator @@ -120,7 +120,7 @@ } /** - * Constructor + * Constructor * * @param format See {@link #format} */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java Mon Mar 29 07:58:51 2010 +0000 @@ -58,8 +58,8 @@ protected final int GAP_MAX_VALUES = 60; /** - * Map to store max ranges of each parameter - * (org.jfree.chart.axis.Axis.setAutoRange(true) doesn't seem to work + * Map to store max ranges of each parameter + * (org.jfree.chart.axis.Axis.setAutoRange(true) doesn't seem to work * properly. */ protected Map values; @@ -392,7 +392,7 @@ int endPos ) { String axis = null; - + if (results.length > (startPos+1)) { axis = getDependendAxisName( results[startPos], @@ -482,9 +482,9 @@ /** - * Simple method to detect gaps. A gap is detected if the delta between two - * data points (current, last) is bigger than <code>PERCENTAGE</code> percent - * of delta of start and end. + * Simple method to detect gaps. A gap is detected if the delta between two + * data points (current, last) is bigger than <code>PERCENTAGE</code> percent + * of delta of start and end. * <br> * (smallDelta > delta / 100 * PERCENTAGE) * @@ -537,7 +537,7 @@ return (smallDelta > (3.0 / (count - 1) * delta)); } - + /** * Method used to detect gaps between two data points grids. If the delta * between current and last is bigger than <code>GAP_MAX_LEVEL</code>, a gap @@ -563,7 +563,7 @@ /** * This method returns the key which is used to retrieve the y-value served - * by a <code>Result</code> object. + * by a <code>Result</code> object. * * @param first <code>Result</code> object - not used in this class. * @param second <code>Result</code> object - not used in this class.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/XMLChartTheme.java Mon Mar 29 07:58:51 2010 +0000 @@ -24,7 +24,7 @@ /** * Implementation of JFreeChart's default implementation * <code>StandardChartTheme</code>. This class takes an xml document with a - * bunch of parameters and turns it into a <code>ChartTheme</code> to change + * bunch of parameters and turns it into a <code>ChartTheme</code> to change * the appearance of charts. * * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> @@ -51,7 +51,7 @@ * Field storing the visibility of the range crosshair */ protected boolean rangeCrosshairVisible; - + /** * Field storing the visiblity of lines. */ @@ -467,7 +467,7 @@ plot.setDomainCrosshairVisible(this.domainCrosshairVisible); plot.setRangeCrosshairVisible(this.rangeCrosshairVisible); - AbstractXYItemRenderer renderer = (AbstractXYItemRenderer) + AbstractXYItemRenderer renderer = (AbstractXYItemRenderer) plot.getRenderer(); if (renderer instanceof XYLineAndShapeRenderer)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/exception/TechnicalChartException.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/exception/TechnicalChartException.java Mon Mar 29 07:58:51 2010 +0000 @@ -2,7 +2,7 @@ /** * @author <a href="mailto:tim.englich@intevation.de">Tim Englich</a> - * + * */ public class TechnicalChartException extends Exception { @@ -19,7 +19,7 @@ /** * Constructor - * + * * @param message */ public TechnicalChartException(String message) { @@ -28,7 +28,7 @@ /** * Constructor - * + * * @param cause */ public TechnicalChartException(Throwable cause) { @@ -37,7 +37,7 @@ /** * Constructor - * + * * @param message * @param cause */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java Mon Mar 29 07:58:51 2010 +0000 @@ -61,7 +61,7 @@ /** - * A method to export a <code>JFreeChart</code> as image to an + * A method to export a <code>JFreeChart</code> as image to an * <code>OutputStream</code> with a given format, width and height. * * @param out OutputStream @@ -133,7 +133,7 @@ /** * A method to export a <code>JFreeChart</code> histogram as SVG to an * <code>OutputStream</code>. - * + * * @param out OutputStream * @param histograms Array of {@link de.intevation.gnv.chart.Chart} * @param encoding Encoding, defaults to {@link DEFAULT_ENCODING} if null @@ -178,7 +178,7 @@ /** * A method to export a <code>JFreeChart</code> as SVG to an * <code>OutputStream</code>. - * + * * @param out OutputStream * @param chart JFreeChart to be exported * @param encoding Encoding, defaults to {@link DEFAULT_ENCODING} if null
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultExport.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultExport.java Mon Mar 29 07:58:51 2010 +0000 @@ -52,7 +52,7 @@ * @throws StateException */ protected void writeData( - Profile profile, + Profile profile, Collection result, CSVWriter writer ) @@ -87,13 +87,13 @@ */ public void create( Profile profile, - OutputStream outputStream, + OutputStream outputStream, Collection result ) throws IOException, UnsupportedEncodingException, - StateException + StateException { if (result == null) { String msg = "No data given for generation of " + @@ -105,10 +105,10 @@ CSVWriter writer = new CSVWriter( new OutputStreamWriter( outputStream, - profile.getEncoding()), + profile.getEncoding()), profile.getSeparator(), profile.getQuoteCharacter(), - profile.getEscapeCharacter()); + profile.getEscapeCharacter()); writeData(profile, result, writer);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultProfile.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/DefaultProfile.java Mon Mar 29 07:58:51 2010 +0000 @@ -21,7 +21,7 @@ protected String [] header; /** - * + * */ protected String [] names;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/Export.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/Export.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * This interface should be implemented by a class whose instances are intended - * to export a <code>Collection</code> of <code>Result</code>s into a specific + * to export a <code>Collection</code> of <code>Result</code>s into a specific * format (e.g. CSV or ODV). * * @author <a href="mailto:sascha.teichmann@intevation.de">Sascha L. Teichmann</a> @@ -110,7 +110,7 @@ */ public void create( Profile profile, - OutputStream outputStream, + OutputStream outputStream, Collection result ) throws IOException, UnsupportedEncodingException, StateException;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ODVExport.java Mon Mar 29 07:58:51 2010 +0000 @@ -26,12 +26,12 @@ * Logger used for logging via log4j. */ private static Logger log = Logger.getLogger(ODVExport.class); - + /** * Collection of parameters. */ private Collection parameters = null; - + /** * Constructor * @param collector @@ -56,25 +56,25 @@ headerList.add(header[i]); } ArrayList<String> paramids = new ArrayList<String>(); - + Map<String[], Map<String,String>> aggregatedRows = new HashMap<String[], Map<String,String>>(); - + String currentParameterID = "N/N"; - + while (it.hasNext()) { Result res = it.next(); String[] key = collector.getData(res); String parameterValue = res.getString("DATAVALUE"); String parameterID = res.getString("PARAMETER"); - + if (!currentParameterID.equals(parameterID)){ paramids.add(parameterID); headerList.add(this.findParamTitle(parameters, parameterID)); headerList.add("QF"); currentParameterID = parameterID; } - + Map<String,String> aggregatedRow = aggregatedRows.get(key); if (aggregatedRow!= null){ aggregatedRow.put(parameterID, parameterValue); @@ -84,7 +84,7 @@ aggregatedRows.put(key, params); } } - + if (header != null){ writer.writeNext(headerList.toArray(header)); } @@ -109,7 +109,7 @@ writer.writeNext(rowList.toArray(row)); } } - + /** * This method is used to search specific value coresponding to its key * <code>id</code> and return its description. @@ -133,7 +133,7 @@ } return ""; } - + } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ShapeDataCollector.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ShapeDataCollector.java Mon Mar 29 07:58:51 2010 +0000 @@ -45,7 +45,7 @@ * * @see de.intevation.gnv.exports.Export.DataCollector#getData(Result) */ - public String[] getData(Result result) + public String[] getData(Result result) throws StateException { if (rd == null) @@ -55,7 +55,7 @@ String [] entries = new String[names.length+1]; int j = 0; for (int i = 0; i < names.length; i++) { - + if (names[i].equals("SHAPE")) { Point p = (Point)wktReader.read(result.getString("SHAPE"));
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/SimpleOdvDataCollector.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/SimpleOdvDataCollector.java Mon Mar 29 07:58:51 2010 +0000 @@ -71,14 +71,14 @@ String [] entries = new String[names.length+1]; int j = 0; for (int i = 0; i < names.length; i++) { - + if (names[i].equals("SHAPE")) { Point p = (Point)wktReader.read(result.getString("SHAPE")); entries[j++] = ""+p.getX(); entries[j++] = ""+p.getY(); } - // Change the datetime format from yyyy.MM.dd HH:mm:ss to + // Change the datetime format from yyyy.MM.dd HH:mm:ss to // yyyy-MM-dd HH:mm else if (names[i].equals("TIMEVALUE")) { Date source = srcFormat.parse(result.getString(names[i]));
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonPlot.java Mon Mar 29 07:58:51 2010 +0000 @@ -203,7 +203,7 @@ AlphaComposite.SRC_OVER, getForegroundAlpha() )); - + // draw axis drawAxes(g2, area, dataArea, info);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/jfreechart/PolygonRenderer.java Mon Mar 29 07:58:51 2010 +0000 @@ -58,7 +58,7 @@ } } // class DefaultLabelGenerator - public static final PolygonSeriesLabelGenerator + public static final PolygonSeriesLabelGenerator DEFAULT_LABEL_GENERATOR_INSTANCE = new DefaultLabelGenerator(); protected PaintLookup lookup; @@ -69,7 +69,7 @@ } public PolygonRenderer( - PaintLookup lookup, + PaintLookup lookup, PolygonSeriesLabelGenerator labelGenerator ) { this.lookup = lookup; @@ -135,7 +135,7 @@ final CompactXYItems ring = series.getItem(j); LevelOrderIndices loi = new LevelOrderIndices(ring.size()-1); Rectangle2D r = (Rectangle2D)loi.visit( - new LevelOrderIndices.Visitor() + new LevelOrderIndices.Visitor() { ValueAxis da = plot.getDomainAxis(); ValueAxis ra = plot.getRangeAxis(); @@ -145,7 +145,7 @@ 0d, 0d, box.getWidth(), box.getHeight()); public Object visit(int index) { - r.x = da.valueToJava2D(ring.getX(index), area, de) + r.x = da.valueToJava2D(ring.getX(index), area, de) - 0.5*box.getWidth(); r.y = ra.valueToJava2D(ring.getY(index), area, re) + 0.5*box.getHeight(); @@ -171,7 +171,7 @@ protected Shape constructShape( PolygonPlot plot, Rectangle2D area, - PolygonSeries series, + PolygonSeries series, boolean close ) { ValueAxis da = plot.getDomainAxis();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/layer/LayerArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -15,7 +15,7 @@ * the logger, used to log exceptions and additionally information */ private static Logger log = Logger.getLogger(LayerArtifact.class); - + /** * The UID of this Class */ @@ -33,11 +33,11 @@ /** * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, - * de.intevation.artifacts.ArtifactFactory, java.lang.Object + * de.intevation.artifacts.ArtifactFactory, java.lang.Object * org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { log.debug("LayerArtifact.setup"); super.setup(identifier, factory, context, data);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/AttributedXYColumns.java Mon Mar 29 07:58:51 2010 +0000 @@ -6,7 +6,7 @@ import java.io.Serializable; -import de.intevation.gnv.jfreechart.PolygonDataset; +import de.intevation.gnv.jfreechart.PolygonDataset; /** * @author Ingo Weinzierl (ingo.weinzierl@intevation.de)
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantFunction.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/ConstantFunction.java Mon Mar 29 07:58:51 2010 +0000 @@ -9,7 +9,7 @@ implements UnivariateRealFunction { protected double value; - + public ConstantFunction() { }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation2D.java Mon Mar 29 07:58:51 2010 +0000 @@ -176,7 +176,7 @@ continue; } queryBuffer.init( - center.x - EPS, center.x + EPS, + center.x - EPS, center.x + EPS, center.y - EPS, center.y + EPS); finder.prepare(center); @@ -220,7 +220,7 @@ } if (debug) { - log.debug("interpolations: " + + log.debug("interpolations: " + interpolations + " / " + missedInterpolations); } }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation3D.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/Interpolation3D.java Mon Mar 29 07:58:51 2010 +0000 @@ -170,7 +170,7 @@ linearToMap.locate(p, center); queryBuffer.init( - center.x - EPS, center.x + EPS, + center.x - EPS, center.x + EPS, center.y - EPS, center.y + EPS); finder.prepare(center); @@ -224,9 +224,9 @@ center.y); raster[j] = value; } - // XXX: Adjusted depth to create no gap + // XXX: Adjusted depth to create no gap // between last value and ground. - depths[i] = z+0.5d*cellHeight; + depths[i] = z+0.5d*cellHeight; } // down the x/y column } // all along the track
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearFunction.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearFunction.java Mon Mar 29 07:58:51 2010 +0000 @@ -14,7 +14,7 @@ { public static final LinearFunction INSTANCE = new LinearFunction(); - public static class Univariate + public static class Univariate implements UnivariateRealFunction { protected double m; @@ -43,13 +43,13 @@ } public double value(double x, double [] parameters) - throws FunctionEvaluationException + throws FunctionEvaluationException { return x*parameters[0] + parameters[1]; } - public double [] gradient(double x, double [] parameters) - throws FunctionEvaluationException + public double [] gradient(double x, double [] parameters) + throws FunctionEvaluationException { return new double [] { x, 1f }; }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/LinearToMap.java Mon Mar 29 07:58:51 2010 +0000 @@ -27,7 +27,7 @@ } public Range( - double from, + double from, double to, Interpolator interpolator, Coordinate p1, @@ -68,8 +68,8 @@ } public LinearToMap( - List<? extends Coordinate> path, - double from, + List<? extends Coordinate> path, + double from, double to, Metrics metrics ) { @@ -135,7 +135,7 @@ } public static double length( - List<? extends Coordinate> path, + List<? extends Coordinate> path, Metrics metrics ) { double sum = 0d;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/math/QueriedXYDepth.java Mon Mar 29 07:58:51 2010 +0000 @@ -30,17 +30,17 @@ * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(QueriedXYDepth.class); - + private static final String queryID = "rasterQuery"; - + private QueryExecutor queryExecutor; - + private ArrayList<SoftReference<RasterObject>> rasterData; private RasterObject last; private int interpolation; - + public QueriedXYDepth() { this(RasterObject.BILINEAR); } @@ -56,9 +56,9 @@ */ public double depth(Coordinate coordinate) { double resultValue = Double.NaN; - + RasterObject ro = getRasterObject(coordinate); - + if (ro == null) { try { String[] filterValues = new String[] { WKTUtils.toWKT(coordinate) }; @@ -75,9 +75,9 @@ } return ro != null ? ro.getValue(coordinate, interpolation) - : Double.NaN; + : Double.NaN; } - + private RasterObject getRasterObject(Coordinate coordinate) { if (last != null && last.contains(coordinate)) { return last;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class HorizontalProfileArtifact extends GNVArtifactBase { @@ -36,12 +36,12 @@ /** - * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, - * de.intevation.artifacts.ArtifactFactory, java.lang.Object, + * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, + * de.intevation.artifacts.ArtifactFactory, java.lang.Object, * org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { log.debug("HorizontalProfileArtifact.setup"); super.setup(identifier, factory, context, data);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileInstantaneousPointArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileInstantaneousPointArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class HorizontalProfileInstantaneousPointArtifact extends HorizontalProfileArtifact {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class HorizontalProfileMeshArtifact extends HorizontalProfileArtifact { /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshCrossArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileMeshCrossArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -21,7 +21,7 @@ */ private static Logger log = Logger .getLogger(HorizontalProfileMeshCrossArtifact.class); - + /** * Constructor */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontalcrosssection/HorizontalCrossSectionMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -36,12 +36,12 @@ /** - * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, - * de.intevation.artifacts.ArtifactFactory, java.lang.Object, + * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, + * de.intevation.artifacts.ArtifactFactory, java.lang.Object, * org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { log.debug("HorizontalCrossSectionMeshArtifact.setup"); super.setup(identifier, factory, context, data);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class VerticalProfileArtifact extends GNVArtifactBase { /** @@ -36,11 +36,11 @@ /** * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, - * de.intevation.artifacts.ArtifactFactory, java.lang.Object, + * de.intevation.artifacts.ArtifactFactory, java.lang.Object, * org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { log.debug("VerticalProfileArtifact.setup"); super.setup(identifier, factory, context, data);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileInstantaneousPointArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class VerticalProfileInstantaneousPointArtifact extends VerticalProfileArtifact {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class VerticalProfileMeshArtifact extends VerticalProfileArtifact { /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class VerticalCrossSectionMeshArtifact extends GNVArtifactBase { /** @@ -33,15 +33,15 @@ log.debug("VerticalCrossSectionMeshArtifact.Constructor"); this.name = "verticalCrossSectionMesh"; } - + /** * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, - * de.intevation.artifacts.ArtifactFactory, java.lang.Object, + * de.intevation.artifacts.ArtifactFactory, java.lang.Object, * org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { log.debug("VerticalCrossSectionMeshArtifact.setup"); super.setup(identifier, factory, context, data);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/DemuxRingsHandler.java Mon Mar 29 07:58:51 2010 +0000 @@ -23,8 +23,8 @@ } public void handleRings( - List<Edge> rings, - int value, + List<Edge> rings, + int value, int width, int height ) {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoProducer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/IsoProducer.java Mon Mar 29 07:58:51 2010 +0000 @@ -44,8 +44,8 @@ } public void handleRings( - List<Edge> rings, - int value, + List<Edge> rings, + int value, int width, int height ) {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiPolygonProducer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/JTSMultiPolygonProducer.java Mon Mar 29 07:58:51 2010 +0000 @@ -88,8 +88,8 @@ } public void handleRings( - List<Edge> rings, - int value, + List<Edge> rings, + int value, int width, int height ) {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Palette.java Mon Mar 29 07:58:51 2010 +0000 @@ -17,10 +17,10 @@ */ public class Palette implements ValueToIndex -{ +{ private static Logger log = Logger.getLogger(Palette.class); - public static final class Entry + public static final class Entry implements Comparable { private Entry left; @@ -50,10 +50,10 @@ } public Entry( - int index, + int index, int externalIndex, - double from, - double to, + double from, + double to, Color color, String description ) {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/PolygonDatasetProducer.java Mon Mar 29 07:58:51 2010 +0000 @@ -32,8 +32,8 @@ } public void handleRings( - List<Edge> rings, - int value, + List<Edge> rings, + int value, int width, int height ) {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/raster/Vectorizer.java Mon Mar 29 07:58:51 2010 +0000 @@ -20,7 +20,7 @@ void handleRings( List<Edge> rings, - int value, + int value, int width, int height); @@ -79,7 +79,7 @@ public int length() { int length = 0; Edge current = this; - do { ++length; } + do { ++length; } while ((current = current.next) != null && current != this); return length; } @@ -329,8 +329,8 @@ } handler.handleRings( - rings, - currentValue, + rings, + currentValue, width + 1, height + 1);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/AutoResumeState.java Mon Mar 29 07:58:51 2010 +0000 @@ -3,9 +3,9 @@ */ package de.intevation.gnv.state; /** - * + * * Markerinterface for States which should be used for - * automatically Resume and jump to the next State using + * automatically Resume and jump to the next State using * the Conditions of the Transitions which are linked to it. * @author Tim Englich <tim.englich@intevation.de> *
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/CoordinateSelectionState.java Mon Mar 29 07:58:51 2010 +0000 @@ -37,22 +37,22 @@ * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(CoordinateSelectionState.class); - + /** * The UID of this Class */ private static final long serialVersionUID = 6318923553625195063L; - + /** * XPATH Expressions for the setup. */ - + private final static String MESH_WIDTH_XPATH = "mesh-width"; private final static String XLINK_XPATH = "xlink:href"; private final static String MESH_LIST_XPATH = "/mesh-widths/mesh"; private final static String ID_XPATH = "id"; private final static String WIDTH_VALUE_XPATH = "width"; - + /** * Holds all given Widths between two MeshPoints for different Meshes. */ @@ -107,9 +107,9 @@ log.error(e,e); } return returnValue; - + } - + /** * @see de.intevation.gnv.state.StateBase#extractKVP(java.util.Collection, java.lang.String, java.lang.String) */ @@ -132,15 +132,15 @@ if (resultValue.getResultDescriptor().getColumnIndex("VALUE") > 0){ value = resultValue.getString("VALUE") + " - "+value; } - - + + keyValueDescibeData.add(new DefaultKeyValueDescribeData(key,value )); } prevKey = key; } return keyValueDescibeData; } - + protected static String convert2DisplayCoordinate(String wkt){ return WKTUtils.toText(wkt); } @@ -152,7 +152,7 @@ public void setup(Node configuration) { super.setup(configuration); Element widthElement = (Element)Config.getNodeXPath(configuration, MESH_WIDTH_XPATH); - + if (widthElement != null){ String fileName = widthElement.getAttribute(XLINK_XPATH); fileName = Config.replaceConfigDir(fileName);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultAutoResumeState.java Mon Mar 29 07:58:51 2010 +0000 @@ -29,7 +29,7 @@ public DefaultAutoResumeState() { super(); } - + /** * @see de.intevation.gnv.state.StateBase#purifyResult(java.util.Collection, java.lang.String) */ @@ -42,6 +42,6 @@ protected String[] getDescriptionForInputData(InputData data, String uuid) { return new String[0]; } - - + + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultInputValue.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultInputValue implements InputValue {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultOutputMode.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultOutputMode.java Mon Mar 29 07:58:51 2010 +0000 @@ -21,7 +21,7 @@ /** * Constructor - * + * * @param name * @param description * @param mimeType
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/DefaultState.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultState extends StateBase {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputData.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface InputData extends Serializable { @@ -26,6 +26,6 @@ public String[] getDescription(); public void concartValue(String value); - + String[] splitValue(); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/InputValue.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface InputValue extends Serializable {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxDateState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxDateState.java Mon Mar 29 07:58:51 2010 +0000 @@ -124,7 +124,7 @@ DescribeData values = new DefaultMinMaxDescribeData( dataName, min, max, getID()); - this.inputData.put(dataName, new DefaultInputData(dataName, values)); + this.inputData.put(dataName, new DefaultInputData(dataName, values)); return feedSuccess(); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/MinMaxState.java Mon Mar 29 07:58:51 2010 +0000 @@ -137,12 +137,12 @@ } } - + DescribeData values = new DefaultMinMaxDescribeData( dataName, min, max, getID()); - this.inputData.put(dataName, new DefaultInputData(dataName, values)); + this.inputData.put(dataName, new DefaultInputData(dataName, values)); return feedSuccess(); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputMode.java Mon Mar 29 07:58:51 2010 +0000 @@ -9,7 +9,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface OutputMode extends Serializable {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -15,15 +15,15 @@ /** * @author Tim Englich (tim.englich@intevation.de) - * + * */ -public interface OutputState +public interface OutputState extends State { /** * Returns the Rendered Result of an State. - * + * * @param outputMode * The Mode that should be produces (Chart, Map, ...) * @return The Bytecode of the Result @@ -39,7 +39,7 @@ /** * Delivers the provided OutputModes of an State - * + * * @return the provided OutputModes of an State */ public Collection<OutputMode> getOutputModes();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/OutputStateBase.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ import org.w3c.dom.NodeList; import de.intevation.artifactdatabase.Config; -import de.intevation.artifactdatabase.XMLUtils; +import de.intevation.artifactdatabase.XMLUtils; import de.intevation.artifacts.CallContext; import de.intevation.artifacts.CallMeta; import de.intevation.gnv.artifacts.cache.CacheFactory; @@ -35,10 +35,10 @@ /** * @author Tim Englich (tim.englich@intevation.de) * @author Ingo Weinzierl (ingo.weinzierl@intevation.de) - * + * */ -public abstract class OutputStateBase -extends StateBase +public abstract class OutputStateBase +extends StateBase implements OutputState { public static final String XPATH_OUTPUT_MODE = @@ -67,7 +67,7 @@ * The different Outputmodes which are provided by an OutputState */ protected Collection<OutputMode> outputModes = null; - + protected String queryODVID = null; /** @@ -92,9 +92,9 @@ public void setup(Node configuration) { log.debug("OutputStateBase.setup"); super.setup(configuration); - + this.queryODVID = Config.getStringXPath(configuration,"queryID-odv"); - + NodeList outputModeList = Config.getNodeSetXPath(configuration, "outputsModes/outputsMode"); if (outputModeList != null) { @@ -170,13 +170,13 @@ } public void out( - Document format, + Document format, Collection<InputData> inputData, - OutputStream outputStream, - String uuid, + OutputStream outputStream, + String uuid, CallMeta callMeta ) - throws StateException + throws StateException { } @@ -235,7 +235,7 @@ } return null; } - + protected Collection<Result> getODVResult(String uuid) { log.debug("OutputStateBase.getODVResult"); // TODO add Caching? I think it's not nessessary @@ -270,7 +270,7 @@ } return returnValue; } - + protected void removeChartResult(String uuid) { log.debug("OutputStateBase.getChartResult"); if (CacheFactory.getInstance().isInitialized()) { @@ -321,7 +321,7 @@ * @see de.intevation.gnv.state.StateBase#putInputData(java.util.Collection, java.lang.String) */ @Override - public void putInputData(Collection<InputData> inputData, + public void putInputData(Collection<InputData> inputData, String uuid) throws StateException { log.debug("OutputStateBase.putInputData"); @@ -394,7 +394,7 @@ throw new StateException(errMsg); } - } + } else if (tmpObj != null && tmpObj instanceof MinMaxDescribeData) { MinMaxDescribeData data = (MinMaxDescribeData) tmpObj; if (this.inputData == null) { @@ -405,7 +405,7 @@ this.inputData.put("maxvalue", new DefaultInputData("maxvalue", (String) data.getMaxValue())); } else { - + String errMsg = "No Inputvalue given for Inputdata " + tmpItem.getName(); log.warn(errMsg + "Value will be ignored");
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferCoordinateSelectionState.java Mon Mar 29 07:58:51 2010 +0000 @@ -27,7 +27,7 @@ private static final long serialVersionUID = -3972304838976884048L; private String transferPreSettingsName = null; - + private String transferInputDataname = null; /** * Constructor @@ -52,7 +52,7 @@ this.putInputData(localInputdata, uuid); } } - + super.initialize(uuid, context); } @@ -61,7 +61,7 @@ */ @Override public void setup(Node configuration) { - + Element preSettingsNode = (Element)Config.getNodeXPath(configuration, "presettings-transfer"); if (preSettingsNode != null){ @@ -70,7 +70,7 @@ } super.setup(configuration); } - - + + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/PreSettingsTransferState.java Mon Mar 29 07:58:51 2010 +0000 @@ -26,7 +26,7 @@ private static final long serialVersionUID = 573381812690806922L; private String transferPreSettingsName = null; - + private String transferInputDataname = null; /** * Constructor @@ -51,7 +51,7 @@ this.putInputData(localInputdata, uuid); } } - + super.initialize(uuid, context); } @@ -60,7 +60,7 @@ */ @Override public void setup(Node configuration) { - + Element preSettingsNode = (Element)Config.getNodeXPath(configuration, "presettings-transfer"); if (preSettingsNode != null){ @@ -69,7 +69,7 @@ } super.setup(configuration); } - - + + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/SingleInputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -14,7 +14,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class SingleInputState extends StateBase {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Mon Mar 29 07:58:51 2010 +0000 @@ -147,7 +147,7 @@ this.description = ((Element)configuration).getAttribute("description"); log.info("State-ID = " + this.id); - + NodeList inputValuesNodes = Config.getNodeSetXPath(configuration, "inputvalues/inputvalue"); this.inputValues = new HashMap<String, InputValue>(inputValuesNodes @@ -166,8 +166,8 @@ .warn("Used in Query Value cannot be transformed into a Number"); } } - InputValue inputValue = new DefaultInputValue(inputValueNode.getAttribute("name"), - inputValueNode.getAttribute("type"), + InputValue inputValue = new DefaultInputValue(inputValueNode.getAttribute("name"), + inputValueNode.getAttribute("type"), Boolean.parseBoolean(inputValueNode. getAttribute("multiselect")), usedinQuery); this.inputValues.put(inputValue.getName(), inputValue); @@ -184,15 +184,15 @@ if (dataMultiSelectValue != null) { this.dataMultiSelect = Boolean.parseBoolean(dataMultiSelectValue); } - + String dataNoSelectValue =Config.getStringXPath(configuration, "data-noselect"); if (dataNoSelectValue != null) { this. dataNoSelect = Boolean.parseBoolean(dataNoSelectValue); } - - this.preSettingsName = Config.getStringXPath(configuration, "presettings-name"); - + + this.preSettingsName = Config.getStringXPath(configuration, "presettings-name"); + } /** @@ -236,7 +236,7 @@ boolean valid = iv.isInputValid(tmpItem.getValue(), inputValue.getType()); if (valid) { - + if (tmpItem.getName().equals(this.dataName)){ String[] desc = getDescriptionForInputData(tmpItem, uuid); tmpItem.setDescription(desc); @@ -416,8 +416,8 @@ public void setPreSettings(Map<String, InputData> preSettings) { this.preSettings = preSettings; } - - + + public Map<String, InputData> getPreSettings() { return this.preSettings; @@ -483,7 +483,7 @@ String[] filterValues = list.toArray(new String[list.size()]); return filterValues; } - + protected String prepareInputData4RegionDBQuery(String value){ return value; } @@ -585,14 +585,14 @@ } String tmpKey = resultValue.getString(keyPos); - // TODO: FIXME: We have to do that because the arcsde does not + // TODO: FIXME: We have to do that because the arcsde does not // support a distinct Query on Layers. if (previousKey == null || !tmpKey.equals(previousKey)){ previousKey = tmpKey; if (!filterWithPresettings || preSettingValues.contains(tmpKey)){ keyValueDescibeData.add( new DefaultKeyValueDescribeData( - tmpKey, + tmpKey, resultValue.getString(valuePos), getID()) );
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateFactory.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,7 +10,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class StateFactory {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultKeyValueDescribeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultKeyValueDescribeData implements KeyValueDescibeData {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultMinMaxDescribeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultMinMaxDescribeData implements MinMaxDescribeData { @@ -17,8 +17,8 @@ private Object minValue = null; private Object maxValue = null; - - private String name = null; + + private String name = null; private String state = null;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DefaultSingleValueDescribeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class DefaultSingleValueDescribeData implements SingleValueDescribeData { @@ -26,7 +26,7 @@ /** * Constructor - * + * * @param name * @param value */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/DescribeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,9 +7,9 @@ /** * Markerinterface - * + * * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface DescribeData extends Serializable {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/KeyValueDescibeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface KeyValueDescibeData extends Serializable {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/MinMaxDescribeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface MinMaxDescribeData extends DescribeData { @@ -18,7 +18,7 @@ public void setMaxValue(Object maxValue); public String getName(); - + public String getMinName(); public String getMaxName();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedArrayList.java Mon Mar 29 07:58:51 2010 +0000 @@ -8,7 +8,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class NamedArrayList<E> extends ArrayList<E> implements NamedCollection<E> { @@ -30,7 +30,7 @@ /** * Constructor - * + * * @param initialCapacity */ public NamedArrayList(String name, int initialCapacity) { @@ -40,7 +40,7 @@ /** * Constructor - * + * * @param c */ public NamedArrayList(String name, Collection<E> c) {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/NamedCollection.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,7 +7,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface NamedCollection<E> extends Collection<E> {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/describedata/SingleValueDescribeData.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,14 +5,14 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public interface SingleValueDescribeData extends DescribeData { public String getName(); public String getValue(); - + public void setValue(String value); public String getState();
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/exception/StateException.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class StateException extends Exception { @@ -23,7 +23,7 @@ /** * Constructor - * + * * @param message */ public StateException(String message) { @@ -32,7 +32,7 @@ /** * Constructor - * + * * @param cause */ public StateException(Throwable cause) { @@ -41,7 +41,7 @@ /** * Constructor - * + * * @param message * @param cause */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/layer/LayerOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -46,43 +46,43 @@ * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(LayerOutputState.class); - + /** * The UID of this Class. */ private static final long serialVersionUID = 9180957321704424049L; - + // TODO: Replace public static final String LAYER_MODEL = "layer"; /** * The ID for the Query fetching the Layer from the DB */ - private String dataQueryID = null; - + private String dataQueryID = null; + /** * The ID for the Query fetching the Geometry from the DB * which should be used to Clip the Layerdata */ private String geometryQueryID = null; - + private String columnQueryID = null; - + /** * The ID for the Value which will hold the Geometrie-Value */ private String geometryID = null; - + private Boolean shapeFileLock = new Boolean(true); - + private String shapeFilePath; - + private String geometryType = null; - + private String templateID = null; - + public static final String SHAPEFILE_NAME = "data.shp"; - + /** * Constructor */ @@ -91,14 +91,14 @@ } /** - * @see de.intevation.gnv.state.OutputState#out(org.w3c.dom.Document, - * java.util.Collection, java.io.OutputStream, + * @see de.intevation.gnv.state.OutputState#out(org.w3c.dom.Document, + * java.util.Collection, java.io.OutputStream, * java.lang.String, de.intevation.artifacts.CallContext) */ public void out(Document format, Collection<InputData> inputData, OutputStream outputStream, String uuid, CallContext callContext) throws StateException { - + log.debug("LayerOutputState.out"); String outputMode = XMLUtils.xpathString( format, XPATH_OUTPUT_MODE, ArtifactNamespaceContext.INSTANCE); @@ -117,7 +117,7 @@ }else{ this.writeExceptionReport2Stream(outputStream); } - + } } @@ -130,8 +130,8 @@ createExceptionReport("No Data to Export", document); XMLUtils.toStream(document,outputStream); } - - + + /** * Fetches the Data from the Databasebackend * @return @@ -152,13 +152,13 @@ String table = resultValue.getString(0); String where = resultValue.getString(1); String columns = this.fetchColumns(table); - + templateID = resultValue.getString(2); if (this.geometryID != null){ - InputData geometryInputData = + InputData geometryInputData = this.inputData.get(this.geometryID); if (geometryInputData != null){ - + try { Collection<Result> geometryData = queryExecutor .executeQuery(this.geometryQueryID, @@ -178,7 +178,7 @@ geometryWKT}; }else{ //Look into the presetting for an WKT - InputData geometryWKTData = this.preSettings != null ? + InputData geometryWKTData = this.preSettings != null ? this.preSettings.get("geometry") : null ; if (geometryWKTData != null){ @@ -192,7 +192,7 @@ } }else{ //Look into the presetting for an WKT - InputData geometryWKTData = this.preSettings != null ? + InputData geometryWKTData = this.preSettings != null ? this.preSettings.get("geometry") : null ; if (geometryWKTData != null){ @@ -205,14 +205,14 @@ } } } - + try { data = queryExecutor.executeQuery(dataQueryID, queryValues); if (data != null && geometryWKT != null){ WKTReader wktReader = new WKTReader(); Geometry border = wktReader.read(geometryWKT); - + Iterator<Result> dataIt = data.iterator(); while (dataIt.hasNext()){ // Trim the Geometries using the @@ -226,7 +226,7 @@ log.error("Error parsing Geometry "+ currentWKT); log.error(e,e); } - + if (currentGeometry != null){ Geometry newGeometry = currentGeometry.intersection(border); current.addColumnValue(0, newGeometry.toText()); @@ -250,9 +250,9 @@ // Only use the first Table the second one will be ignored. QueryExecutor queryExecutor = QueryExecutorFactory.getInstance() .getQueryExecutor(); - + Collection<Result> columnData = queryExecutor. - executeQuery(this.columnQueryID, + executeQuery(this.columnQueryID, filter); if (columnData != null && !columnData.isEmpty()){ StringBuffer sb = new StringBuffer(); @@ -268,7 +268,7 @@ } returnValue = sb.toString(); } - + } catch (QueryException e) { log.error(e,e); } @@ -284,18 +284,18 @@ "inputvalue-geometry"); this.geometryQueryID = Config.getStringXPath(configuration, "queryID-geometry"); - + this.columnQueryID = "layer_colums"; //Config.getStringXPath(configuration, // "queryID-columns"); } - + protected String writeToShapeFile( String uuid, Collection<Result> data, CallContext callContext ) { File baseDir = shapefileDirectory(callContext); - + File shapeDir = new File(baseDir, uuid); boolean success = false; boolean createdDir = false; @@ -309,7 +309,7 @@ } if (!shapeDir.mkdirs()) { - log.error("cannot create directory '" + log.error("cannot create directory '" + shapeDir.getAbsolutePath() + "'"); return null; } @@ -321,7 +321,7 @@ log.error("writing data into shapefile failed"); return null; } - + shapeFilePath = shapeDir.getAbsolutePath(); success = true; @@ -335,13 +335,13 @@ } } } - + protected void writeZip( String uuid, CallContext callContext, OutputStream output, Collection<Result> data - ) + ) throws StateException { try { @@ -353,7 +353,7 @@ } } else { - + if ((p = writeToShapeFile(uuid, data, callContext)) != null) { FileUtils.createZipArchive(new File(p), output); } @@ -363,13 +363,13 @@ log.error(ioe.getLocalizedMessage(), ioe); } } - + public String getShapeFilePath() { synchronized (shapeFileLock) { return shapeFilePath; } } - + private static File shapefileDirectory(CallContext callContext) { // TODO: Refactoring nessessary it should be used only one Shapefilepath // for alle Modes. Code was taken from HorizontalCrossSectionMeshOutputState @@ -381,7 +381,7 @@ ? dir : GNVArtifactContext.DEFAULT_HORIZONTAL_CROSS_SECTION_PROFILE_SHAPEFILE_PATH; } - + /** * @see de.intevation.gnv.state.StateBase#endOfLife(java.lang.Object) */ @@ -418,7 +418,7 @@ } // run }.start(); } - + public String resetShapeFilePath() { synchronized (shapeFileLock) { String path = shapeFilePath; @@ -428,9 +428,9 @@ return path; } } - protected Document getWMS(String uuid, - CallContext callContext, - Collection<Result> data) + protected Document getWMS(String uuid, + CallContext callContext, + Collection<Result> data) throws StateException { // TODO: Do the real WMS publishing here! @@ -445,18 +445,18 @@ pathElement.setTextContent(path); } else { - + if (data != null && (path = writeToShapeFile(uuid, data, callContext)) != null) { String paramType = LAYER_MODEL+"_"+templateID; - + if (!MapfileGenerator.getInstance().templateExists(paramType)){ // If the template doesn't exist the Defaulttemplates will be used. paramType = LAYER_MODEL+"_"+this.geometryType.toLowerCase(); } - Document meta = MetaWriter.writeLayerMeta(callContext, uuid, - path, paramType, + Document meta = MetaWriter.writeLayerMeta(callContext, uuid, + path, paramType, this.determineGeometryType()); if (meta != null) { MapfileGenerator.getInstance().update(); @@ -469,11 +469,11 @@ return document; } - + private String determineGeometryType(){ - + String returnValue = this.geometryType.toLowerCase(); - + if (returnValue.equalsIgnoreCase("linestring")){ returnValue = "Line"; }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileMeshCrossOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -52,14 +52,14 @@ * @author Sascha L. Teichmann (sascha.teichmann@intevation.de) */ public class HorizontalProfileMeshCrossOutputState -extends HorizontalProfileOutputState +extends HorizontalProfileOutputState { public static final boolean USE_INDEX_BUFFER = Boolean.getBoolean("gnv.horizontal.profile.mesh.cross.index.buffer"); private static final long serialVersionUID = 2205958041745637263L; - + /** * the logger, used to log exceptions and additonaly information */ @@ -67,14 +67,14 @@ HorizontalProfileMeshCrossOutputState.class); private String ijkQueryID = null; - + /** * Constructor */ public HorizontalProfileMeshCrossOutputState() { super(); } - + /** * @see de.intevation.gnv.state.timeseries.TimeSeriesOutputState#setup(org.w3c.dom.Node) */ @@ -82,7 +82,7 @@ public void setup(Node configuration) { super.setup(configuration); this.ijkQueryID = Config.getStringXPath(configuration,"queryID-ijk"); - + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/HorizontalProfileOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -37,14 +37,14 @@ */ public class HorizontalProfileOutputState extends TimeSeriesOutputState -{ +{ public static final String [] HORIZONTAL_PROFILE_MESH_COLUMNS = { "SHAPE", "YORDINATE", "GROUP1", "MESHID" }; - + public static final String [] HORIZONTAL_PROFILE_MEASUREMENT_COLUMNS = { "SHAPE", "YORDINATE", @@ -69,7 +69,7 @@ "ParameterID", "SurveyID" }; - + /** * The UID of this class */ @@ -216,7 +216,7 @@ new ShapeDataCollector(HORIZONTAL_PROFILE_MEASUREMENT_COLUMNS)); } - + export.create(profile, out, results); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontal/NorthSouthEastWestState.java Mon Mar 29 07:58:51 2010 +0000 @@ -25,11 +25,11 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class NorthSouthEastWestState extends StateBase { - + /** * The UID of this Class */ @@ -75,8 +75,8 @@ RessourceFactory factory = RessourceFactory.getInstance(); // XXX Workarround - we need these strings in purifyResult, but have no - // CallMeta object there which is necessary to get resources from - // RessourceFactory. Storing the strings here is not nice, because the + // CallMeta object there which is necessary to get resources from + // RessourceFactory. Storing the strings here is not nice, because the // Locale object could change! ipos = factory.getRessource( callMeta.getLanguages(), "iposition", "iposition");
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -109,7 +109,7 @@ } public void initialize(String uuid, CallContext callContext) - throws StateException { + throws StateException { super.initialize(uuid, callContext); if (log.isDebugEnabled()) { log.debug("initialize output state " + uuid); @@ -172,13 +172,13 @@ } public void out( - Document format, + Document format, Collection<InputData> inputData, OutputStream outputStream, String uuid, CallContext callContext ) - throws StateException + throws StateException { String outputMode = XMLUtils.xpathString( format, XPATH_OUTPUT_MODE, ArtifactNamespaceContext.INSTANCE); @@ -210,7 +210,7 @@ String uuid, CallContext callContext, OutputStream output - ) + ) throws StateException { try { @@ -359,7 +359,7 @@ FileUtils.deleteContent(shapeDir); } else if (!shapeDir.mkdirs()) { - log.error("cannot create directory '" + log.error("cannot create directory '" + shapeDir.getAbsolutePath() + "'"); return null; } @@ -408,7 +408,7 @@ FileUtils.deleteRecursive(shapeDir); } } - } + } protected AttributedPoint2ds getResult(String uuid, CallContext callContext) @@ -432,8 +432,8 @@ return result; } - - protected AttributedPoint2ds produceResult(CallContext callContext) + + protected AttributedPoint2ds produceResult(CallContext callContext) throws StateException { InputData meshPolygon = inputData.get("mesh_polygon"); @@ -534,7 +534,7 @@ int pIdx = rd.getColumnIndex("PARAMETERID"); if (sIdx == -1 || iIdx == -1 - || jIdx == -1 || kIdx == -1 + || jIdx == -1 || kIdx == -1 || vIdx == -1 || tIdx == -1 || pIdx == -1 ) { @@ -560,7 +560,7 @@ Point2d p2d = new Point2d(coord.x, coord.y, v, i, j); points.add(p2d); - + } ap2ds.setPoints(points); @@ -610,7 +610,7 @@ int extrapolationRounds = extrapolationRounds(callContext); if (!interpolation.interpolate( - input.getPoints(), + input.getPoints(), boundingBox, new Dimension(numSamples, numSamples), new QueriedXYDepth(groundInterpolation), @@ -648,7 +648,7 @@ polygon, boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMaxX(), boundingBox.getMaxY()); - + int numRegions = new Vectorizer(intRaster, numSamples) .process(jtsmpp); @@ -705,14 +705,14 @@ return input; } - + @Override public void setup(Node configuration) { super.setup(configuration); this.ijkQueryID = Config.getStringXPath(configuration,"queryID-ijk"); - + } - + private static int numSamples(CallContext callContext) { GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); @@ -744,7 +744,7 @@ } private static int getGroundInterpolation(CallContext callContext) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); String interpolation = (String)context.get( @@ -756,7 +756,7 @@ private static Map<Integer, PaletteManager> getPalettes( CallContext callContext ) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); Map<Integer, PaletteManager> palettes = (Map<Integer, PaletteManager>)context.get(
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/vertical/VerticalProfileOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -29,7 +29,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class VerticalProfileOutputState extends TimeSeriesOutputState { @@ -40,7 +40,7 @@ "FEATUREID", "TIMESERIESID" }; - + public static final String [] VERTICAL_PROFILE_MESH_COLUMNS = { "XORDINATE", // not quite sure if this is depth "YORDINATE", @@ -48,7 +48,7 @@ "FEATUREID", "MESHID" }; - + public static final String [] VERTICAL_PROFILE_MEASUREMENT_COLUMNS = { "XORDINATE", // not quite sure if this is depth "YORDINATE",
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/verticalcrosssection/VerticalCrossSectionOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -131,7 +131,7 @@ public void initialize(String uuid, CallContext callContext) throws StateException { super.initialize(uuid, callContext); - + getChartResult(uuid, callContext); } @@ -269,7 +269,7 @@ } private static int getGroundInterpolation(CallContext callContext) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); String interpolation = (String)context.get( @@ -279,7 +279,7 @@ } private static Dimension getRasterSize(CallContext callContext) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); Dimension size = (Dimension)context.get( GNVArtifactContext.VERTICAL_CROSS_SECTION_SAMPLES_KEY); @@ -291,7 +291,7 @@ private static List<Filter.Factory> getFilterFactories( CallContext callContext ) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); List<Filter.Factory> factories = (List<Filter.Factory>)context.get( GNVArtifactContext.VERTICAL_CROSS_SECTION_FILTER_FACTORIES_KEY); @@ -303,7 +303,7 @@ private static Map<Integer, PaletteManager> getPalettes( CallContext callContext ) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); Map<Integer, PaletteManager> palettes = (Map<Integer, PaletteManager>)context.get( @@ -314,7 +314,7 @@ } private static Paint getGroundFill(CallContext callContext) { - GNVArtifactContext context = + GNVArtifactContext context = (GNVArtifactContext)callContext.globalContext(); Paint fill = (Paint)context.get( GNVArtifactContext.VERTICAL_CROSS_SECTION_GROUND_FILL_KEY); @@ -460,7 +460,7 @@ .process(ipsp); IsoAttributeGenerator iag = new IsoAttributeGenerator(isoPalette); - Collection<PolygonSeries> ps = ipsp.getSeries(iag); + Collection<PolygonSeries> ps = ipsp.getSeries(iag); ipsp.clear(); if (debug) { @@ -630,7 +630,7 @@ OutputStream outputStream, Collection<Result> chartResult ) - throws UnsupportedEncodingException, IOException, StateException + throws UnsupportedEncodingException, IOException, StateException { // TODO: Implement a substitution which makes sense. }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java Mon Mar 29 07:58:51 2010 +0000 @@ -488,7 +488,7 @@ /** * TODO Result is not used at the moment. Change result with correct data. */ - protected void createODV(OutputStream outputStream, + protected void createODV(OutputStream outputStream, Collection result, String uuid) throws IOException, StateException { @@ -523,7 +523,7 @@ Element setElement = xmlUtilities.createArtifactElement(doc, "statistic"); setElement.setAttribute("name", set.getName()); - + Iterator<Statistic> sit = set.getStatistics().iterator(); while (sit.hasNext()){ Statistic s = sit.next(); @@ -861,7 +861,7 @@ if (measurementNameValue != null) { this.measuremenValueName = measurementNameValue; } - + String dateNameValue = Config.getStringXPath(configuration, "value-names/value-name[@name='date']/@value"); if (dateNameValue != null) { @@ -878,8 +878,8 @@ gapDefinition = (Element)new ArtifactXMLUtilities(). readConfiguration(absolutFileName); } - - NodeList gapDefinitions = Config.getNodeSetXPath(gapDefinition, + + NodeList gapDefinitions = Config.getNodeSetXPath(gapDefinition, "/time-gaps/time-gap"); if (gapDefinition != null){ timeGapDefinitions = new ArrayList<TimeGap>(gapDefinitions. @@ -890,8 +890,8 @@ int key = Integer.parseInt(gapNode.getAttribute("key")); int value = Integer.parseInt(gapNode.getAttribute("gap")); log.info("Add new Timegap: "+key+" "+value+" "+ unit); - timeGapDefinitions.add(new DefaultTimeGap(unit, - key, + timeGapDefinitions.add(new DefaultTimeGap(unit, + key, value)); } }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/AbstractStatistics.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/AbstractStatistics.java Mon Mar 29 07:58:51 2010 +0000 @@ -20,11 +20,11 @@ protected StatisticSet generateStatisticsValues( DescriptiveStatistics lStatistics, - SimpleRegression lRegression, + SimpleRegression lRegression, String statisticName ) { StatisticSet statisticSet = new StatisticSet(statisticName); - + statisticSet.addStatistic( new Statistic( "gnviewer.statistics.descriptive.arithmeticMean", @@ -32,7 +32,7 @@ statisticSet.addStatistic( new Statistic( - "gnviewer.statistics.descriptive.kurtosis", + "gnviewer.statistics.descriptive.kurtosis", lStatistics.getKurtosis())); statisticSet.addStatistic( @@ -82,7 +82,7 @@ statisticSet.addStatistic( new Statistic( - "gnviewer.statistics.descriptive.intercept", + "gnviewer.statistics.descriptive.intercept", lRegression.getIntercept())); statisticSet.addStatistic(
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/HorizontalProfileStatistics.java Mon Mar 29 07:58:51 2010 +0000 @@ -18,18 +18,18 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class HorizontalProfileStatistics extends TimeseriesStatistics { - + private static Logger log = Logger.getLogger(HorizontalProfileStatistics.class); private WKTReader wktReader = new WKTReader(); - + private DistanceCalculator dc = new DistanceCalculator(); - + private double distance = 0; - + /** * Constructor */ @@ -47,7 +47,7 @@ Point start = (Point)this.wktReader.read(previousRow.getString("SHAPE")); Point current = (Point)this.wktReader.read(row.getString("SHAPE")); double delta = this.dc.calculateDistance(start, current); - + if (!Double.isNaN(delta)){ this.distance = this.distance + delta; } @@ -68,11 +68,11 @@ Collection<KeyValueDescibeData> parameters, Collection<KeyValueDescibeData> measurements, Collection<KeyValueDescibeData> dates) { - return (this.findValueTitle(parameters, break1)+ " "+ + return (this.findValueTitle(parameters, break1)+ " "+ this.findValueTitle(measurements,break2)).trim()+" "+ this.findValueTitle(dates,break3); } - + /** * @see de.intevation.gnv.statistics.TimeseriesStatistics#clearStatistics() */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/StatisticSet.java Mon Mar 29 07:58:51 2010 +0000 @@ -12,27 +12,27 @@ */ public class StatisticSet { - + private String name = null; - + private Collection<Statistic> statistics = new ArrayList<Statistic>(); - + /** * Constructor */ public StatisticSet(String name) { this.name = name; } - - + + public void addStatistic(Statistic statistic){ this.statistics.add(statistic); } - + public Collection<Statistic> getStatistics(){ return this.statistics; } - + public String getName(){ return this.name; }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/VerticalProfileStatistics.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class VerticalProfileStatistics extends TimeseriesStatistics { @@ -35,11 +35,11 @@ Collection<KeyValueDescibeData> parameters, Collection<KeyValueDescibeData> measurements, Collection<KeyValueDescibeData> dates) { - - return (this.findValueTitle(parameters, break1)+ " "+ + + return (this.findValueTitle(parameters, break1)+ " "+ this.findValueTitle(measurements,break2)).trim(); } - - + + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/exception/StatisticsException.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/exception/StatisticsException.java Mon Mar 29 07:58:51 2010 +0000 @@ -5,7 +5,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class StatisticsException extends Exception { @@ -22,7 +22,7 @@ /** * Constructor - * + * * @param arg0 */ public StatisticsException(String arg0) { @@ -31,7 +31,7 @@ /** * Constructor - * + * * @param arg0 */ public StatisticsException(Throwable arg0) { @@ -40,7 +40,7 @@ /** * Constructor - * + * * @param arg0 * @param arg1 */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -38,11 +38,11 @@ /** * @see de.intevation.gnv.artifacts.GNVArtifactBase#setup(java.lang.String, - * de.intevation.artifacts.ArtifactFactory, java.lang.Object + * de.intevation.artifacts.ArtifactFactory, java.lang.Object * org.w3c.dom.Document) */ @Override - public void setup(String identifier, ArtifactFactory factory, + public void setup(String identifier, ArtifactFactory factory, Object context, Document data) { log.debug("TimeSeriesArtifact.setup"); super.setup(identifier, factory, context, data);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesMeshArtifact.java Mon Mar 29 07:58:51 2010 +0000 @@ -8,7 +8,7 @@ private static final long serialVersionUID = 5680432486700275986L; /** - * + * * Constructor */ public TimeSeriesMeshArtifact() {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/DefaultTimeGap.java Mon Mar 29 07:58:51 2010 +0000 @@ -13,20 +13,20 @@ * See the Constants in de.intevation.gnv.timeseries.gap.TimeGap */ private String unit; - + /** * The Key of the TimeGap which must be equivalent to the * Key used in the DWH */ private int key; - + /** * The Value of the Gap. * Use the Unit and the Time Constants to Calculate the * value in Milliseconds */ private int value; - + /** * Constructor * @param unit
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/gap/TimeGap.java Mon Mar 29 07:58:51 2010 +0000 @@ -1,31 +1,31 @@ package de.intevation.gnv.timeseries.gap; public interface TimeGap { - + public final static String TIME_UNIT_MINUTE = "m"; public final static String TIME_UNIT_HOUR = "h"; public final static String TIME_UNIT_DAY = "D"; public final static String TIME_UNIT_WEEK = "W"; public final static String TIME_UNIT_MONTH = "M"; public final static String TIME_UNIT_YEAR = "Y"; - + public final static long MINUTE_IN_MILLIS = 60 * 1000; public final static long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS; public final static long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS; public final static long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS; - - + + /** * Returns the Lookup-Key for the TimeGap * @return */ int getKey(); - + /** * Returns the Value of the TimeValue in the Unit which is also given. * @return */ int getValue(); - + /** * Returns the Unit of the Timegap (e.g. Minutes, Hours, Days, Weeks, Months, Years) * @return
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/PresettingsValueCompareTransition.java Mon Mar 29 07:58:51 2010 +0000 @@ -22,11 +22,11 @@ * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(PresettingsValueCompareTransition.class); - + private String dataName = null; private String dataValue = null; private String operator = null; - + /** * The UID of this Class. */ @@ -67,6 +67,6 @@ this.dataValue = Config.getStringXPath(configuration,"condition/@value"); this.operator = Config.getStringXPath(configuration,"condition/@operator"); } - + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/Transition.java Mon Mar 29 07:58:51 2010 +0000 @@ -7,31 +7,31 @@ import de.intevation.gnv.state.State; /** - * + * * @author Tim Englich <tim.englich@intevation.de> * */ public interface Transition extends Serializable{ - + /** * Returns the ID of the State from which the Transition could be used * @return the ID of the State from which the Transition could be used */ public String getFrom(); - + /** * Returns the ID of the State where it is possible to go as next. * @return the ID of the State where it is possible to go as next. */ public String getTo(); - + /** * Determines if it is possible to go along this Transition or not. * @param state the current State * @return */ public boolean isValid(State state); - + /** * Configures the Transition. * @param configuration
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionBase.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ private static final long serialVersionUID = -8542097519466477977L; private String from = null; - + private String to = null; /** * Constructor @@ -40,7 +40,7 @@ public String getTo() { return this.to; } - + /** * @see de.intevation.gnv.transition.Transition#setup(org.w3c.dom.Node) */
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/TransitionFactory.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,7 +10,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class TransitionFactory {
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/ValueCompareTransition.java Mon Mar 29 07:58:51 2010 +0000 @@ -23,11 +23,11 @@ * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(ValueCompareTransition.class); - + private String dataName = null; private String dataValue = null; private String operator = null; - + /** * The UID of this Class. */ @@ -44,7 +44,7 @@ * @see de.intevation.gnv.transition.Transition#isValid(de.intevation.gnv.state.State) */ public boolean isValid(State state) { - + try { Iterator<InputData> it = state.getInputData().iterator(); while (it.hasNext()){ @@ -77,6 +77,6 @@ this.dataValue = Config.getStringXPath(configuration,"condition/@value"); this.operator = Config.getStringXPath(configuration,"condition/@operator"); } - + }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java Mon Mar 29 07:58:51 2010 +0000 @@ -11,7 +11,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactFactoryUtilities { /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactXMLUtilities.java Mon Mar 29 07:58:51 2010 +0000 @@ -28,7 +28,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class ArtifactXMLUtilities implements Serializable { /** @@ -152,11 +152,11 @@ reportNode.appendChild(successNode); return document; } - + public Node readConfiguration(String fileName){ try { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setValidating(false); + factory.setValidating(false); return factory.newDocumentBuilder().parse(fileName).getChildNodes().item(0); } catch (SAXException e) { log.error(e,e);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/DistanceCalculator.java Mon Mar 29 07:58:51 2010 +0000 @@ -15,57 +15,57 @@ public class DistanceCalculator { private final static double flattening = 1.0 / 298.257233563; - + private final static double earthRadius = 6378137.0 / 1000.0 ; - + /** * Constructor */ public DistanceCalculator() { } - + public static double calculateDistance(Point p1, Point p2){ return calculateDistance(p1.getCoordinate(), p2.getCoordinate()); } public static double calculateDistance(Coordinate p1, Coordinate p2){ double resultValue = 0.0; - + double b1 = p1.y; double b2 = p2.y; - + double l1 = p1.x; double l2 = p2.x; - - + + double F = (b1 + b2) / 2.0; double G = (b1 - b2) / 2.0; double l = (l1 - l2) / 2.0; - + F = (Math.PI / 180.0) * F; G = (Math.PI / 180.0) * G; l = (Math.PI / 180.0) * l; - + double S = ((Math.sin(G) * Math.sin(G)) * ((Math.cos(l) * Math.cos(l))))+ ((Math.cos(F) * Math.cos(F)) * ((Math.sin(l) * Math.sin(l)))); - + double C = ((Math.cos(G) * Math.cos(G)) * ((Math.cos(l) * Math.cos(l))))+ ((Math.sin(F) * Math.sin(F)) * ((Math.sin(l) * Math.sin(l)))); - + double w = Math.atan(Math.sqrt((S/C))); - + double D = 2.0 * w * earthRadius; - + double R = Math.sqrt((S*C)) / w; - + double H1 = (3.0 * R - 1.0 ) / (2.0 * C); double H2 = (3.0 * R + 1.0 ) / (2.0 * S); - - resultValue = D * (1 + (flattening * H1 * (Math.sin(F) * Math.sin(F)) * - (Math.cos(G) * Math.cos(G))) - - (flattening * H2 * (Math.cos(F) * Math.cos(F)) * + + resultValue = D * (1 + (flattening * H1 * (Math.sin(F) * Math.sin(F)) * + (Math.cos(G) * Math.cos(G))) - + (flattening * H2 * (Math.cos(F) * Math.cos(F)) * (Math.sin(G) * Math.sin(G)))); - + return resultValue; }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ExclusiveExec.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ExclusiveExec.java Mon Mar 29 07:58:51 2010 +0000 @@ -6,7 +6,7 @@ * This class can be used to synchronize threads with a given key. To use this * synchronization, you first need to do call {@link #acquire(String)} to * retrieve a {@link UniqueKey}. After this, you can call the code being - * synchronized. After this execution, you need to call + * synchronized. After this execution, you need to call * {@link #release(UniqueKey)} with your token you retrieved from {@link * #acquire(String)}. A thread needs to wait for another thread if their keys * are equal. Threads with different keys don't need to wait for each other.
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,15 +19,15 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class InputValidator { /** * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(InputValidator.class); - - + + public final static String NODATASELECTEDVALUE = "n/n"; /** @@ -61,14 +61,14 @@ log.debug("Is valid? " + returnValue); return returnValue; } - + public boolean isInputValid(String input, String type) { log.debug("InputValidator.isInputValid " + input + " " + type); boolean returnValue = false; String[] values = input.split(","); for (int i = 0; i < values.length; i++) { boolean valid; - + if (NODATASELECTEDVALUE.equals(values[i].trim())){ valid = true; } else if ("Integer".equalsIgnoreCase(type)) { @@ -113,11 +113,11 @@ log.debug("Is valid? " + returnValue); return returnValue; } - - + + public Point getPointValue(String value) throws ValidationException{ log.debug("InputValidator.getPointValue " + value); - + if (value.toLowerCase().startsWith("point")){ try { return (Point)new WKTReader().read(value); @@ -127,7 +127,7 @@ } }else{ String[] s, p; - + double x=0,y=0; log.info("Position :"+value); s = value.split(" "); @@ -145,8 +145,8 @@ } catch (Exception e) { throw new ValidationException("Kein N|S oder nicht im ersten Substring, zB 56n42"); - - } + + } p = s[1].split("[eEwW]"); try { if (p.length ==1) @@ -158,7 +158,7 @@ } catch (Exception e) { throw new ValidationException("Kein E|W oder nicht im zweiten Substring"); - } + } return new GeometryFactory().createPoint(new Coordinate(x,y)); } }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MapfileGenerator.java Mon Mar 29 07:58:51 2010 +0000 @@ -125,7 +125,7 @@ logger.debug("THREAD END"); } } - + public boolean templateExists(String templateID){ Template template = getTemplateByName(templateID); return template != null;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/MetaWriter.java Mon Mar 29 07:58:51 2010 +0000 @@ -38,7 +38,7 @@ private MetaWriter() { } - + public static Document writeLayerMeta(CallContext context, String uuid, String path, @@ -51,11 +51,11 @@ ArtifactNamespaceContext.NAMESPACE_PREFIX); Element root = creator.create("meta"); meta.appendChild(root); - + writeAbstractMeta(context, meta, root); writeLayerMeta(context, meta, root, uuid, paramType,layerType); boolean success = writeMetaFile(path, meta); - + if (success){ return meta; }else{ @@ -218,8 +218,8 @@ meta.appendChild(layer); } - - + + public static void writePolygonMeta( CallContext context, Document document,
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ShapeFileWriter.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ShapeFileWriter.java Mon Mar 29 07:58:51 2010 +0000 @@ -67,7 +67,7 @@ parameterId, layer, date, - multiLineStrings, + multiLineStrings, "isolines"); } @@ -97,12 +97,12 @@ } SimpleFeatureType TYPE; - - try { + + try { TYPE = DataUtilities.createType( name, "geom:MultiLineString:srid=4326," + - "PARAMETER:Integer," + + "PARAMETER:Integer," + "LAYER:Integer," + "DATE:Date," + "VALUE:Double," + @@ -116,7 +116,7 @@ SimpleFeatureBuilder featureBuilder = new SimpleFeatureBuilder(TYPE); - FeatureCollection<SimpleFeatureType, SimpleFeature> collection = + FeatureCollection<SimpleFeatureType, SimpleFeature> collection = FeatureCollections.newCollection(); for (Pair<Object, MultiLineString> pair: multiLineStrings) { @@ -155,7 +155,7 @@ featureStore.addFeatures(collection); transaction.commit(); success = true; - } + } catch (IOException ioe) { log.error(ioe.getLocalizedMessage(), ioe); } @@ -181,22 +181,22 @@ Map<Integer, MultiPolygon> multiPolygons ) { return writeMultiPolygonsToFile( - shapeFile, + shapeFile, parameterId, layer, date, - multiPolygons, + multiPolygons, "polygons"); } - + public static String writeDataToFile(File shapeFile, String name, Collection<Result> data){ String geomType = null; - + WKTReader wktReader = new WKTReader(); - + Map<String, Serializable> params = new HashMap<String, Serializable>(); try { @@ -216,7 +216,7 @@ SimpleFeatureType type = null; SimpleFeatureBuilder featureBuilder = null; - FeatureCollection<SimpleFeatureType, SimpleFeature> collection = + FeatureCollection<SimpleFeatureType, SimpleFeature> collection = FeatureCollections.newCollection(); int j = 0; for (Result result: data) { @@ -226,7 +226,7 @@ ResultDescriptor rd = result.getResultDescriptor(); int columns = rd.getColumnCount(); if (type == null){ - try { + try { geomType = g.getGeometryType().toUpperCase(); String schema = "geom:"+g.getGeometryType()+":srid=4326"; for (int i = 1; i < columns; i++){ @@ -279,7 +279,7 @@ featureStore.addFeatures(collection); transaction.commit(); success = true; - } + } catch (IOException ioe) { log.error(ioe.getLocalizedMessage(), ioe); } @@ -295,9 +295,9 @@ } return geomType; - + } - + public static boolean writeMultiPolygonsToFile( File shapeFile, Integer parameterId, @@ -324,12 +324,12 @@ } SimpleFeatureType TYPE; - - try { + + try { TYPE = DataUtilities.createType( name, "geom:MultiPolygon:srid=4326," + - "PARAMETER:Integer," + + "PARAMETER:Integer," + "LAYER:Integer," + "DATE:Date," + "CLASS:Integer"); @@ -342,7 +342,7 @@ SimpleFeatureBuilder featureBuilder = new SimpleFeatureBuilder(TYPE); - FeatureCollection<SimpleFeatureType, SimpleFeature> collection = + FeatureCollection<SimpleFeatureType, SimpleFeature> collection = FeatureCollections.newCollection(); for (Map.Entry<Integer, MultiPolygon> entry: @@ -382,7 +382,7 @@ featureStore.addFeatures(collection); transaction.commit(); success = true; - } + } catch (IOException ioe) { log.error(ioe.getLocalizedMessage(), ioe); }
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/WKTUtils.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/WKTUtils.java Mon Mar 29 07:58:51 2010 +0000 @@ -122,7 +122,7 @@ } public static final String indexBox( - java.awt.Point a, + java.awt.Point a, java.awt.Point b, String iName, String jName @@ -173,7 +173,7 @@ new ArrayList<Object []>(); createIJKPoints(coords, meshid, ijkQueryID, points, missingPoints); - + String additionWhere = null; if (missingPoints.size() == coords.length) { @@ -211,7 +211,7 @@ ArrayList<Object []> missingPoints = new ArrayList<Object []>(); createIJKPoints(coords, meshid, ijkQueryID, points, missingPoints); - + String additionWhere = TRUE_EXPRESSION; if (missingPoints.size() == coords.length) { @@ -224,8 +224,8 @@ if (!remainsMissingPoints) { // TODO: Make Tablenames and Columns Configurable IndexBuffer ib = new IndexBuffer( - points, - I_NAME, + points, + I_NAME, J_NAME ); additionWhere = ib.toWhereClause(); log.debug("Additional Where Clause = "+additionWhere); @@ -310,14 +310,14 @@ List<java.awt.Point> points, ArrayList<Object []> missingPoints ) - throws QueryException + throws QueryException { boolean debug = log.isDebugEnabled(); QueryExecutor queryExecutor = QueryExecutorFactory .getInstance() .getQueryExecutor(); - + for (int i = 0; i < coords.length; i++) { String wkt = toWKT(coords[i]);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/wms/LayerInfo.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/wms/LayerInfo.java Mon Mar 29 07:58:51 2010 +0000 @@ -85,7 +85,7 @@ /** * Set {@link #data} to data. * - * @param data + * @param data */ public void setData(String data) { this.data = data;
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/GNVArtifactsTestCaseBase.java Mon Mar 29 07:58:51 2010 +0000 @@ -46,11 +46,11 @@ BasicConfigurator.configure(); log = Logger.getLogger(GNVArtifactsTestCaseBase.class); } - + private String configurationDir = "doc/conf"; protected FactoryBootstrap bootstrap = null; - + /** * Constructor */ @@ -64,7 +64,7 @@ public GNVArtifactsTestCaseBase(String name) { super(name); } - + public abstract void testArtifact(); /** * @see junit.framework.TestCase#setUp() @@ -78,7 +78,7 @@ bootstrap = new FactoryBootstrap(); bootstrap.boot(); } - + protected void writeDocument2Log(Document document) { log.debug(new ArtifactXMLUtilities().writeDocument2String(document)); } @@ -109,7 +109,7 @@ throw new Exception(message); } } - + /** * @return */ @@ -139,7 +139,7 @@ this.check4ExceptionReport(outputData); } - + protected void createFile(byte[] content, String fileName) { try { FileOutputStream fos = new FileOutputStream(new File(fileName)); @@ -179,7 +179,7 @@ protected Artifact createArtifact(ArtifactFactory artifactFactory) { Document setupData = null; Artifact artifact = artifactFactory.createArtifact( - "" + System.currentTimeMillis(), + "" + System.currentTimeMillis(), bootstrap.getContext(), setupData); assertNotNull(artifact);
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointHorizontalProfileTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointHorizontalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -20,7 +20,7 @@ GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(InstantaneousPointHorizontalProfileTestCase.class); - + /** * Constructor */ @@ -48,23 +48,23 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/horizontalProfile_instantaneouspoint/horizontalprofile_describe.xml"); - + int steps = 9; - + for (int i = 0; i < steps; i++){ - + this.doNextStep( artifact, cc, "src/test/ressources/horizontalProfile_instantaneouspoint/" + "horizontalprofile_step_0"+i+"_feed.xml", "src/test/ressources/horizontalProfile_instantaneouspoint/" + - "horizontalprofile_step_0"+i+"_advance.xml", + "horizontalprofile_step_0"+i+"_advance.xml", describeDocument); }
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointVerticalProfileTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/InstantaneousPointVerticalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -20,7 +20,7 @@ GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(InstantaneousPointVerticalProfileTestCase.class); - + /** * Constructor */ @@ -47,14 +47,14 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/verticalprofile_instantaneouspoint/verticalprofile_describe.xml"); - + int steps = 5; - + for (int i = 1; i <= steps; i++){ this.doNextStep( artifact, @@ -62,7 +62,7 @@ "src/test/ressources/verticalprofile_instantaneouspoint/" + "verticalprofile_step_0"+i+"_feed.xml", "src/test/ressources/verticalprofile_instantaneouspoint/" + - "verticalprofile_step_0"+i+"_advance.xml", + "verticalprofile_step_0"+i+"_advance.xml", describeDocument); }
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalCrossSectionTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalCrossSectionTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -20,7 +20,7 @@ GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(MeshHorizontalCrossSectionTestCase.class); - + /** * Constructor */ @@ -47,13 +47,13 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("HorizontalCrossSectionMesh-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/horizontalcrosssection_mesh/horizontalcrosssection_describe.xml"); int steps = 8; - + for (int i = 1; i <= steps; i++){ this.doNextStep( artifact, @@ -61,10 +61,10 @@ "src/test/ressources/horizontalcrosssection_mesh/" + "horizontalcrosssection_step_0"+i+"_feed.xml", "src/test/ressources/horizontalcrosssection_mesh/" + - "horizontalcrosssection_step_0"+i+"_advance.xml", + "horizontalcrosssection_step_0"+i+"_advance.xml", describeDocument); } - + Document outputData = artifact.describe(describeDocument,cc); FileOutputStream fos = null; FileOutputStream fos2 = null;
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalProfileTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshHorizontalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ public class MeshHorizontalProfileTestCase extends GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(MeshHorizontalProfileTestCase.class); - + /** * Constructor */ @@ -47,14 +47,14 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/horizontalProfile_mesh/horizontalprofile_describe.xml"); - + int steps = 11; - + for (int i = 1; i <= steps; i++){ String number = ""+i; if (i < 10){ @@ -66,10 +66,10 @@ "src/test/ressources/horizontalProfile_mesh/" + "horizontalprofile_step_"+number+"_feed.xml", "src/test/ressources/horizontalProfile_mesh/" + - "horizontalprofile_step_"+number+"_advance.xml", + "horizontalprofile_step_"+number+"_advance.xml", describeDocument); } - + Document outputData = artifact.describe(describeDocument,cc); FileOutputStream fos = null; FileOutputStream fos2 = null;
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshTimeSeriesTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshTimeSeriesTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ public class MeshTimeSeriesTestCase extends GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(MeshTimeSeriesTestCase.class); - + /** * Constructor */ @@ -46,15 +46,15 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("TimeSeriesMesh-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/timeseries_mesh/timeseries_describe.xml"); - + int steps = 8; - + for (int i = 1; i <= steps; i++){ this.doNextStep( artifact, @@ -62,7 +62,7 @@ "src/test/ressources/timeseries_mesh/" + "timeseries_step_0"+i+"_feed.xml", "src/test/ressources/timeseries_mesh/" + - "timeseries_step_0"+i+"_advance.xml", + "timeseries_step_0"+i+"_advance.xml", describeDocument); } // Achter Schritt
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalCrossSectionTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalCrossSectionTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ public class MeshVerticalCrossSectionTestCase extends GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(MeshVerticalCrossSectionTestCase.class); - + /** * Constructor */ @@ -47,26 +47,26 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/verticalcrosssection_mesh/verticalcrosssection_describe.xml"); - + int steps = 7; - + for (int i = 1; i <= steps; i++){ - + this.doNextStep( artifact, cc, "src/test/ressources/verticalcrosssection_mesh/" + "verticalcrosssection_step_0"+i+"_feed.xml", "src/test/ressources/verticalcrosssection_mesh/" + - "verticalcrosssection_step_0"+i+"_advance.xml", + "verticalcrosssection_step_0"+i+"_advance.xml", describeDocument); } - + Document outputData = artifact.describe(describeDocument,cc); FileOutputStream fos = null; FileOutputStream fos2 = null; @@ -75,7 +75,7 @@ fos = new FileOutputStream( "src/test/results/verticalcrosssection_mesh" + System.currentTimeMillis() + ".png"); - + fos2 = new FileOutputStream( "src/test/results/verticalcrosssection_mesh" + System.currentTimeMillis() + ".csv"); @@ -95,7 +95,7 @@ // "verticalcrosssection_mesh/" + // "verticalcrosssection_step_0"+steps+"_out_odv.xml"), // fos3,cc); - + } catch (Exception e) { log.error(e, e); fail();
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalProfileTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/MeshVerticalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -19,7 +19,7 @@ public class MeshVerticalProfileTestCase extends GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(MeshVerticalProfileTestCase.class); - + /** * Constructor */ @@ -46,16 +46,16 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/" + "verticalprofile_mesh/" + "verticalprofile_describe.xml"); - + int steps = 11; - + for (int i = 1; i <= steps; i++){ String number = ""+i; if (i < 10){ @@ -67,7 +67,7 @@ "src/test/ressources/verticalprofile_mesh/" + "verticalprofile_step_"+number+"_feed.xml", "src/test/ressources/verticalprofile_mesh/" + - "verticalprofile_step_"+number+"_advance.xml", + "verticalprofile_step_"+number+"_advance.xml", describeDocument); } // 10. Schritt
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestArtifactDatabase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestArtifactDatabase.java Mon Mar 29 07:58:51 2010 +0000 @@ -44,7 +44,7 @@ /** * @see de.intevation.artifacts.ArtifactDatabase#createArtifactWithFactory(java.lang.String, de.intevation.artifacts.CallMeta, org.w3c.dom.Document) */ - public Document createArtifactWithFactory(String factory, + public Document createArtifactWithFactory(String factory, CallMeta callMeta, Document data) throws ArtifactDatabaseException {
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TestCallContext.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,7 +10,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class TestCallContext implements CallContext { @@ -23,8 +23,8 @@ /** * Constructor */ - public TestCallContext(Object globalContext, - CallMeta callMeta, + public TestCallContext(Object globalContext, + CallMeta callMeta, ArtifactFactory artifactFactory) { this.globalContext = globalContext; this.callMeta = callMeta;
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointTimeSeriesTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointTimeSeriesTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -18,12 +18,12 @@ */ public class TimeSeriesPointTimeSeriesTestCase extends GNVArtifactsTestCaseBase { - + /** * the logger, used to log exceptions and additonaly information */ private static Logger log = Logger.getLogger(TimeSeriesPointTimeSeriesTestCase.class); - + /** * Constructor */ @@ -50,29 +50,29 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("TimeSeries-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); - + CallContext cc = createCallContext(artifactFactory); - + // Erster Schritt - + Document describeDocument = this.readDocument("src/test/ressources/timeseries/timeseries_describe.xml"); - + int steps = 6; - + for (int i = 1; i <= steps; i++){ - + this.doNextStep( artifact, cc, "src/test/ressources/timeseries/" + "timeseries_step_0"+i+"_feed.xml", "src/test/ressources/timeseries/" + - "timeseries_step_0"+i+"_advance.xml", + "timeseries_step_0"+i+"_advance.xml", describeDocument); } - + Document outputData = artifact.describe(describeDocument,cc); FileOutputStream fos = null; FileOutputStream fos2 = null; @@ -91,7 +91,7 @@ fos4 = new FileOutputStream("src/test/results/timeseries" + System.currentTimeMillis() + ".odv"); - + artifact.out(this .readDocument("src/test/ressources/timeseries/timeseries_step_06_out_chart.xml"), fos, cc);
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/TimeSeriesPointVerticalProfileTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -20,7 +20,7 @@ GNVArtifactsTestCaseBase { private static Logger log = Logger.getLogger(TimeSeriesPointVerticalProfileTestCase.class); - + /** * Constructor */ @@ -47,14 +47,14 @@ .getArtifactFactory(artefactName); assertNotNull(artifactFactory); log.debug("VerticalProfile-ArtifactFactory is available"); - + Artifact artifact = createArtifact(artifactFactory); CallContext cc = createCallContext(artifactFactory); Document describeDocument = this.readDocument("src/test/ressources/verticalprofile/verticalprofile_describe.xml"); int steps = 7; - + for (int i = 1; i <= steps; i++){ this.doNextStep( artifact, @@ -62,7 +62,7 @@ "src/test/ressources/verticalprofile/" + "verticalprofile_step_0"+i+"_feed.xml", "src/test/ressources/verticalprofile/" + - "verticalprofile_step_0"+i+"_advance.xml", + "verticalprofile_step_0"+i+"_advance.xml", describeDocument); }
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/ressource/RessourceFactoryTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/ressource/RessourceFactoryTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -10,7 +10,7 @@ /** * @author Tim Englich <tim.englich@intevation.de> - * + * */ public class RessourceFactoryTestCase extends TestCase { /** @@ -25,7 +25,7 @@ /** * Constructor - * + * * @param name */ public RessourceFactoryTestCase(String name) {
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/util/DistanceCalculatorTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/util/DistanceCalculatorTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -13,17 +13,17 @@ public DistanceCalculatorTestCase(String name) { super(name); } - + public void testDistanceCalculator(){ - + GeometryFactory gf = new GeometryFactory(); - + // Distance between Berlin and Tokio Point p1 = gf.createPoint(new Coordinate(13.4000, 52.5167)); Point p2 = gf.createPoint(new Coordinate(139.7667, 35.7000)); - + double s = new DistanceCalculator().calculateDistance(p1, p2); - + assertEquals(8941.201227763724, s); }
--- a/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/util/ShapeFileWriterTestCase.java Fri Mar 26 15:31:20 2010 +0000 +++ b/gnv-artifacts/src/test/java/de/intevation/gnv/artifacts/util/ShapeFileWriterTestCase.java Mon Mar 29 07:58:51 2010 +0000 @@ -34,7 +34,7 @@ BasicConfigurator.configure(); log = Logger.getLogger(ShapeFileWriterTestCase.class); } - + /** * Constructor * @param name @@ -42,10 +42,10 @@ public ShapeFileWriterTestCase(String name) { super(name); } - - + + public void testMultiLineStringWriter(){ - + try { String wkt = "MULTILINESTRING ((10 10, 20 20),(15 15, 30 15))"; String wkt1 = "MULTILINESTRING ((10 5, 20 20),(15 15, 30 15))"; @@ -74,11 +74,11 @@ new Pair<Object, MultiLineString>( 1.5, multiLineString3)); - - java.io.File shapeFile = new java.io.File("/tmp/test"+System.currentTimeMillis()+".shp"); - + + java.io.File shapeFile = new java.io.File("/tmp/test"+System.currentTimeMillis()+".shp"); + ShapeFileWriter.writeMultiLineStringsToFile(shapeFile, 1, 1, new Date(), multiLineStrings); - + } catch (Exception e) { log.error(e,e); fail();