# HG changeset patch
# User Stephan Holl <stephan.holl@intevation.de>
# Date 1307454765 -7200
# Node ID 196abb30c0d2ab3dbe467ab0c34c4aff743b6fca
# Parent  609c234e8e23ef5917f3c18670e8ce0c669ea472# Parent  d6d2a4058ebf9ffedc00075bc7262c00d0bc6c0e
another merge with raimund

diff -r 609c234e8e23 -r 196abb30c0d2 ChangeLog
--- a/ChangeLog	Tue Jun 07 15:50:43 2011 +0200
+++ b/ChangeLog	Tue Jun 07 15:52:45 2011 +0200
@@ -1,5 +1,9 @@
+2011-06-07  Raimund Renkert  <raimund.renkert@intevation.de>
+
+	* src/java/de/intevation/mxd/writer/MapScriptWriter.java:
+	  Set the class name to the layer name if it is empty.
+
 2011-06-01  Stephan Holl  <stephan.holl@intevation.de>
-
 	*  mapserver/symbols/symbols.sym: added a default hatch-symbol
 
 2011-06-01  Stephan Holl  <stephan.holl@intevation.de>
diff -r 609c234e8e23 -r 196abb30c0d2 src/java/de/intevation/mxd/writer/MapScriptWriter.java
--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Tue Jun 07 15:50:43 2011 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Tue Jun 07 15:52:45 2011 +0200
@@ -209,7 +209,14 @@
         for(int i = 0; i < list.getLength(); i++) {
             Element classElement = (Element)list.item(i);
             classObj co = new classObj(layer);
-            co.setName(classElement.getAttribute("name"));
+            String name = classElement.getAttribute("name");
+            if (name.equals("")) {
+                name = layerElement.getAttribute("name");
+                if (list.getLength() > 1) {
+                    name += "-" + i;
+                }
+            }
+            co.setName (name);
             if(classElement.hasAttribute("field_count")) {
                 int count =
                     Integer.parseInt(classElement.getAttribute("field_count"));