# HG changeset patch
# User raimund renkert <raimund.renkert@intevation.de>
# Date 1311179400 -7200
# Node ID 877be748424529038b6973114da9b62161161865
# Parent  ecf2f68230a2438ca1b0453abbbdc9ee7631f085# Parent  6db0677a64502fe609b951a47405359248402527
Merged.

diff -r 6db0677a6450 -r 877be7484245 ChangeLog
--- 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:
diff -r 6db0677a6450 -r 877be7484245 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.