[MXD2map-commits] r316:5e3a40a84539

[scm-commit at wald.intevation.org]

details:   http://hg.intevation.org/geospatial/mxd2map/rev/5e3a40a84539

changeset: 316:5e3a40a84539

user:      Andre Heinecke <aheinecke at intevation.de>

date:      Mon Sep 17 17:10:44 2012 +0200

description:
Some minor cleanups

	* src/java/de/intevation/mxd/reader/FeatureLayerReader.java:
	Add Debug output if Layer class is not implemented

	* src/java/de/intevation/mxd/reader/RasterLayerReader.java:
	Remove unused import

	* src/java/de/intevation/mxd/reader/WMSLayerReader.java:
	Tune down warnings about min/max scale


diffstat:

 ChangeLog                                                 |  11 +++++++++++
 src/java/de/intevation/mxd/reader/FeatureLayerReader.java |   2 ++
 src/java/de/intevation/mxd/reader/RasterLayerReader.java  |   1 -
 src/java/de/intevation/mxd/reader/WMSLayerReader.java     |   6 ++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diffs (65 lines):

diff -r 1d77ea6a915d -r 5e3a40a84539 ChangeLog
--- a/ChangeLog	Mon Sep 17 17:08:15 2012 +0200
+++ b/ChangeLog	Mon Sep 17 17:10:44 2012 +0200
@@ -1,3 +1,14 @@
+2012-09-17  Andre Heinecke <aheinecke at intevation.de>
+
+	* src/java/de/intevation/mxd/reader/FeatureLayerReader.java:
+	Add Debug output if Layer class is not implemented
+
+	* src/java/de/intevation/mxd/reader/RasterLayerReader.java:
+	Remove unused import
+
+	* src/java/de/intevation/mxd/reader/WMSLayerReader.java:
+	Tune down warnings about min/max scale
+
 2012-09-17  Andre Heinecke <aheinecke at intevation.de>
 
 	Add basic support for Graphics Layer, restricted to TextElements for
diff -r 1d77ea6a915d -r 5e3a40a84539 src/java/de/intevation/mxd/reader/FeatureLayerReader.java
--- a/src/java/de/intevation/mxd/reader/FeatureLayerReader.java	Mon Sep 17 17:08:15 2012 +0200
+++ b/src/java/de/intevation/mxd/reader/FeatureLayerReader.java	Mon Sep 17 17:10:44 2012 +0200
@@ -188,6 +188,8 @@
                         catch(Exception e) {
                             logger.warn("Could not read label properties.");
                         }
+                    } else {
+                        logger.debug("Unknown Layer class: " + prop.getClass().toString());
                     }
                 }
             }
diff -r 1d77ea6a915d -r 5e3a40a84539 src/java/de/intevation/mxd/reader/RasterLayerReader.java
--- a/src/java/de/intevation/mxd/reader/RasterLayerReader.java	Mon Sep 17 17:08:15 2012 +0200
+++ b/src/java/de/intevation/mxd/reader/RasterLayerReader.java	Mon Sep 17 17:10:44 2012 +0200
@@ -26,7 +26,6 @@
 import com.esri.arcgis.carto.AnnotateLayerPropertiesCollection;
 import com.esri.arcgis.carto.IAnnotateLayerProperties;
 import com.esri.arcgis.carto.LabelEngineLayerProperties;
-import com.esri.arcgis.geodatabase.RasterDatasetName;
 import com.esri.arcgis.system.IName;
 import com.esri.arcgis.system.IPropertySet;
 import com.esri.arcgis.geometry.Envelope;
diff -r 1d77ea6a915d -r 5e3a40a84539 src/java/de/intevation/mxd/reader/WMSLayerReader.java
--- a/src/java/de/intevation/mxd/reader/WMSLayerReader.java	Mon Sep 17 17:08:15 2012 +0200
+++ b/src/java/de/intevation/mxd/reader/WMSLayerReader.java	Mon Sep 17 17:10:44 2012 +0200
@@ -114,7 +114,8 @@
                 String.valueOf(layer.getMinimumScale()));
         }
         catch(IOException ioe) {
-            logger.warn("Could not read minimum scale.");
+            logger.debug("Could not read minimum scale.");
+            layerElement.setAttribute("min_scale", "0");
         }
 
         try {
@@ -122,8 +123,9 @@
                 String.valueOf(layer.getMaximumScale()));
         }
         catch(IOException ioe) {
-            logger.warn(
+            logger.debug(
                 "Could not read maximum scale.");
+            layerElement.setAttribute("max_scale", "0");
         }
 
         try {