[Schmitzm-commits] r1231 - in trunk: src/schmitzm/geotools/gui src/skrueger/geotools testresources/shapes/polygonSnowShape testresources/shapes/shp_lines

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-11-04 01:53:20 +0100 (Thu, 04 Nov 2010)
New Revision: 1231

Modified:
   trunk/src/schmitzm/geotools/gui/XMapPane.java
   trunk/src/skrueger/geotools/LegendIconFeatureRenderer.java
   trunk/src/skrueger/geotools/StyledFS.java
   trunk/src/skrueger/geotools/StyledFeaturesInterface.java
   trunk/testresources/shapes/polygonSnowShape/polygonLayerSnow.sld
   trunk/testresources/shapes/shp_lines/waterways.sld
Log:


Modified: trunk/src/schmitzm/geotools/gui/XMapPane.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/XMapPane.java	2010-11-03 21:09:49 UTC (rev 1230)
+++ trunk/src/schmitzm/geotools/gui/XMapPane.java	2010-11-04 00:53:20 UTC (rev 1231)
@@ -61,7 +61,6 @@
 import org.opengis.display.canvas.RenderingState;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.geometry.MismatchedReferenceSystemException;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.operation.MathTransform;

Modified: trunk/src/skrueger/geotools/LegendIconFeatureRenderer.java
===================================================================
--- trunk/src/skrueger/geotools/LegendIconFeatureRenderer.java	2010-11-03 21:09:49 UTC (rev 1230)
+++ trunk/src/skrueger/geotools/LegendIconFeatureRenderer.java	2010-11-04 00:53:20 UTC (rev 1231)
@@ -307,7 +307,8 @@
 						size.height);
 
 				if (style2d != null) {
-					new StyledShapePainter(null).paint(graphics, shape,
+					StyledShapePainter styledShapePainter = new StyledShapePainter(null);
+					styledShapePainter.paint(graphics, shape,
 							style2d, Integer.MAX_VALUE);
 				}
 			}

Modified: trunk/src/skrueger/geotools/StyledFS.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFS.java	2010-11-03 21:09:49 UTC (rev 1230)
+++ trunk/src/skrueger/geotools/StyledFS.java	2010-11-04 00:53:20 UTC (rev 1231)
@@ -41,19 +41,16 @@
 import org.apache.log4j.Logger;
 import org.geotools.data.FeatureSource;
 import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.NameImpl;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.styling.Style;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.AttributeDescriptor;
 import org.opengis.filter.Filter;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 import schmitzm.geotools.io.GeoImportUtil;
 import schmitzm.geotools.styling.StylingUtil;
 import skrueger.AttributeMetadataImpl;
-import skrueger.AttributeMetadataInterface;
 import skrueger.i8n.Translation;
 
 import com.vividsolutions.jts.geom.Envelope;

Modified: trunk/src/skrueger/geotools/StyledFeaturesInterface.java
===================================================================
--- trunk/src/skrueger/geotools/StyledFeaturesInterface.java	2010-11-03 21:09:49 UTC (rev 1230)
+++ trunk/src/skrueger/geotools/StyledFeaturesInterface.java	2010-11-04 00:53:20 UTC (rev 1231)
@@ -36,7 +36,6 @@
 import org.opengis.filter.Filter;
 
 import skrueger.AttributeMetadataImpl;
-import skrueger.AttributeMetadataInterface;
 
 /**
  * This Interface combines all styled layers that are running on

Modified: trunk/testresources/shapes/polygonSnowShape/polygonLayerSnow.sld
===================================================================
--- trunk/testresources/shapes/polygonSnowShape/polygonLayerSnow.sld	2010-11-03 21:09:49 UTC (rev 1230)
+++ trunk/testresources/shapes/polygonSnowShape/polygonLayerSnow.sld	2010-11-04 00:53:20 UTC (rev 1231)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sld:UserStyle xmlns="http://www.opengis.net/sld" xmlns:sld="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml">
   <sld:Name>AtlasStyler v1.6-SNAPSHOT-r201009281724</sld:Name>
-  <sld:Title/>
+  <sld:Title>wikisquare.de</sld:Title>
   <sld:FeatureTypeStyle>
     <sld:Name>QUANTITIES_COLORIZED_POLYGON:VALUE#AV_TEMPER:NORM#null:METHOD#MANUAL:PALETTE#YlOrRd</sld:Name>
     <sld:FeatureTypeName>Point_Char_Dissolve</sld:FeatureTypeName>

Modified: trunk/testresources/shapes/shp_lines/waterways.sld
===================================================================
--- trunk/testresources/shapes/shp_lines/waterways.sld	2010-11-03 21:09:49 UTC (rev 1230)
+++ trunk/testresources/shapes/shp_lines/waterways.sld	2010-11-04 00:53:20 UTC (rev 1231)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <sld:UserStyle xmlns="http://www.opengis.net/sld" xmlns:sld="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml">
   <sld:Name>AtlasStyler v1.1, b155 (2009/08/20 15:50)</sld:Name>
-  <sld:Title>Default Styler</sld:Title>
+  <sld:Title>wikisquare.de</sld:Title>
   <sld:Abstract/>
   <sld:FeatureTypeStyle>
     <sld:Name>UNIQUE_VALUE_LINE</sld:Name>