changeset 201:877be7484245

Merged.
author raimund renkert <raimund.renkert@intevation.de>
date Wed, 20 Jul 2011 18:30:00 +0200
parents ecf2f68230a2 (diff) 6db0677a6450 (current diff)
children 1e3a5019c4ed
files ChangeLog
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jul 20 18:01:32 2011 +0200
+++ b/ChangeLog	Wed Jul 20 18:30:00 2011 +0200
@@ -1,3 +1,13 @@
+2011-07-20  Raimund Renkert  <raimund.renkert@intevation.de>
+
+	* src/java/de/intevation/mxd/writer/MapScriptWriter.java:
+	  Remove all whitespaces from grouplayer name.
+
+2011-07-20  Raimund Renkert  <raimund.renkert@intevation.de>
+
+	* src/java/de/intevation/mxd/writer/MapScriptWriter.java:
+	  Remove leading and trailing whitespaces from labelitem.
+
 2011-07-20  Raimund Renkert  <raimund.renkert@intevation.de>
 
 	* src/java/de/intevation/mxd/writer/MapScriptWriter.java:
--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Wed Jul 20 18:01:32 2011 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Wed Jul 20 18:30:00 2011 +0200
@@ -205,7 +205,9 @@
             layer.setMetaData("wms_title", validateString(lname));
             if(layerElement.hasAttribute("group")) {
 		String group = layerElement.getAttribute("group");
-                layer.setGroup(validateString(group));
+		group = validateString(group);
+		group = group.replaceAll (" ", "");
+                layer.setGroup(group);
             }
 
             //The layer status.
@@ -327,7 +329,7 @@
                 if(!prefix.equals("")) {
                     expr = prefix + "." + expr;
                 }
-                layer.setLabelitem(expr);
+                layer.setLabelitem(expr.trim());
             }
 
             //Write classes.
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)