[Schmitzm-commits] r1622 - in trunk/schmitzm-gt/src/main: java/de/schmitzm/geotools/io resources/de/schmitzm/geotools/gui/resource/locales

Mon Jul 11 13:11:32 CEST 2011

Author: mojays
Date: 2011-07-11 13:11:32 +0200 (Mon, 11 Jul 2011)
New Revision: 1622

Modified:
   trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GeoImportUtil.java
   trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
   trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
Log:
BugFix: GTResourceBundle "ScalePane.PixelMetersScale", bei ${0} Parameter fehlte das $-Zeichen


Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GeoImportUtil.java
===================================================================

--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GeoImportUtil.java	2011-07-08 14:31:49 UTC (rev 1621)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/io/GeoImportUtil.java	2011-07-11 11:11:32 UTC (rev 1622)
@@ -556,10 +556,12 @@
 			// LOGGER.debug("  parseWKT on " + prjUrl);
 			// CRS.parseWKT(readProjectionString(prjUrl));
 			CoordinateReferenceSystem createCRS = GTUtil.createCRS(readProjectionString(prjUrl));
+			if ( createCRS == null )
+			  throw new Exception("GTUtil.createCRS(readProjectionString(.)) returned NULL");
 			((ShapefileDataStore) store).forceSchemaCRS(createCRS);
 
 		} catch (Exception err) {
-			LOGGER.warn(" CRS.parseWKT mit Ex\n: ", err);
+			LOGGER.warn(" CRS.parseWKT mit Exception abgebrochen\n: ", err);
 			LOGGER.warn(" No projection found for file. Default is used.");
 			LOGGER.warn(" NOT calling forceSchemaCRS now... please provide a URL to an existing .prj file!");
 			// store.forceSchemaCRS(DEFAULT_CRS);

Modified: trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties
===================================================================
--- trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties	2011-07-08 14:31:49 UTC (rev 1621)
+++ trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle.properties	2011-07-11 11:11:32 UTC (rev 1622)
@@ -75,7 +75,7 @@
 MapPaneButtons.ZoomIn.TT=Zoom nearer to the map
 MapPaneButtons.ZoomOut.TT=Zoom away from the map
 ScalePane.OGCScaleDenominator=Scale\: 1\:${0}
-ScalePane.PixelMetersScale=1 pixel \= {0} meters
+ScalePane.PixelMetersScale=1 pixel \= ${0} meters
 SearchMapDialog.Explanation=<html>Here you can search all of the map's <b>labels</b>.</html>  
 SearchMapDialog.Results.Column.Layer=found in
 SearchMapDialog.Results.Column.Name=name

Modified: trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties
===================================================================
--- trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties	2011-07-08 14:31:49 UTC (rev 1621)
+++ trunk/schmitzm-gt/src/main/resources/de/schmitzm/geotools/gui/resource/locales/GTResourceBundle_de.properties	2011-07-11 11:11:32 UTC (rev 1622)
@@ -61,7 +61,7 @@
 MapPaneButtons.ZoomIn.TT=Auf einen Auschnitt zoomen
 MapPaneButtons.ZoomOut.TT=Aus der Karte herauszoomen
 ScalePane.OGCScaleDenominator=Ma\u00DFstab\: 1\:${0}
-ScalePane.PixelMetersScale=1 Pixel \= {0}m
+ScalePane.PixelMetersScale=1 Pixel \= ${0}m
 SearchMapDialog.Explanation=<html>Es werden alle <b>Beschriftungen</b> dieser Karte durchsucht.</html> 
 SearchMapDialog.Results.Column.Layer=Gefunden in
 SearchMapDialog.Results.Column.Name=Name

