Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java @ 778:9a828e5a2390
Removed trailing whitespace
gnv-artifacts/trunk@851 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Mon, 29 Mar 2010 07:58:51 +0000 |
parents | c8749d83d9b6 |
children | b1f5f2a8840f |
line wrap: on
line diff
--- 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 + "'"); }