[MXD2map-commits] r332:da60e3ac2b5d

[scm-commit at wald.intevation.org]

details:   http://hg.intevation.org/geospatial/mxd2map/rev/da60e3ac2b5d

changeset: 332:da60e3ac2b5d

user:      Andre Heinecke <aheinecke at intevation.de>

date:      Mon Oct 22 17:39:25 2012 +0200

description:
Fix getLabel calls to work wiht mapscript 6.2 api


diffstat:

 ChangeLog                                               |  3 +++
 src/java/de/intevation/mxd/writer/LabelStyleWriter.java |  2 +-
 src/java/de/intevation/mxd/writer/MapScriptWriter.java  |  2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 10939bda0aaa -r da60e3ac2b5d ChangeLog
--- a/ChangeLog	Mon Oct 22 17:38:01 2012 +0200
+++ b/ChangeLog	Mon Oct 22 17:39:25 2012 +0200
@@ -2,6 +2,9 @@
 
 	* contrib/installer/example/example/epsg/epsg:
 	Add Gauss Kruger zone 2, Germany Zone 2, Germany Zone 3
+	* src/java/de/intevation/mxd/writer/LabelStyleWriter.java,
+	src/java/de/intevation/mxd/writer/MapScriptWriter.java:
+	Fix getLabel calls to work with mapscript 6.2 api
 
 2011-10-22  Andre Heinecke <aheinecke at intevation.de>
 
diff -r 10939bda0aaa -r da60e3ac2b5d src/java/de/intevation/mxd/writer/LabelStyleWriter.java
--- a/src/java/de/intevation/mxd/writer/LabelStyleWriter.java	Mon Oct 22 17:38:01 2012 +0200
+++ b/src/java/de/intevation/mxd/writer/LabelStyleWriter.java	Mon Oct 22 17:39:25 2012 +0200
@@ -72,7 +72,7 @@
     public boolean write(Element symbolElement) {
         logger.debug("write(Element)");
 
-        cl.getLabel().insertStyle(style, -1);
+        cl.getLabel(0).insertStyle(style, -1);
 
         symbolSetObj symbolSet = map.getSymbolset();
 
diff -r 10939bda0aaa -r da60e3ac2b5d src/java/de/intevation/mxd/writer/MapScriptWriter.java
--- a/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Mon Oct 22 17:38:01 2012 +0200
+++ b/src/java/de/intevation/mxd/writer/MapScriptWriter.java	Mon Oct 22 17:39:25 2012 +0200
@@ -720,7 +720,7 @@
         String layerType) {
 
         //Get the label object. Each class has a predefined labelobject.
-        labelObj label = co.getLabel();
+        labelObj label = co.getLabel(0);
 
         //Get the label text symbol attributes from DOM.
         Element symbol = (Element)labelElement.getFirstChild();