[Schmitzm-commits] r440 - in branches/1.0-gt2-2.6/src: schmitzm/geotools/gui skrueger/geotools/selection

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-10-05 15:33:45 +0200 (Mon, 05 Oct 2009)
New Revision: 440

Modified:
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java
   branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
Log:
* backup ShapefileRenderer - the other one doeesn't work
* last commit before changing to UTF

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java	2009-10-05 13:09:40 UTC (rev 439)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java	2009-10-05 13:33:45 UTC (rev 440)
@@ -52,7 +52,6 @@
 import org.geotools.map.MapLayer;
 import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.renderer.GTRenderer;
-import org.geotools.renderer.shape.ShapefileRenderer;
 import org.geotools.styling.Style;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -184,7 +183,7 @@
   public JEditorPane() {
     this( new BorderLayout(),
           true,
-          GTUtil.createGTRenderer(null),
+          GTUtil.createGTRenderer(),
           new DefaultMapContext(DefaultGeographicCRS.WGS84)
     );
   }

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java	2009-10-05 13:09:40 UTC (rev 439)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JMapPane.java	2009-10-05 13:33:45 UTC (rev 440)
@@ -400,10 +400,13 @@
 			GTRenderer renderer, MapContext context, Map<Object, Object> rendererHints) {
 		super(layout != null ? layout : new BorderLayout(),
 				isDoubleBuffered != null ? isDoubleBuffered : true,
-				renderer != null ? renderer : GTUtil.createGTRenderer(context),
+				renderer != null ? renderer : GTUtil.createGTRenderer(),
 				// renderer != null ? renderer : new StreamingRenderer(),
 				context != null ? context : new DefaultMapContext(GeoImportUtil.getDefaultCRS()));
-
+//
+//		// Having problems with StreamingRendere!
+//		getRenderer().setContext(getContext());
+		
 		// Dieser Hint sorgt wohl dafuer, dass die Rasterpixel nicht
 		// interpoliert werden
 		// Ueber die Methode enableAntiAliasing(boolean) kann das

Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java	2009-10-05 13:09:40 UTC (rev 439)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java	2009-10-05 13:33:45 UTC (rev 440)
@@ -59,7 +59,6 @@
 import org.geotools.renderer.GTRenderer;
 import org.geotools.renderer.label.LabelCacheImpl;
 import org.geotools.renderer.lite.StreamingRenderer;
-import org.geotools.renderer.shape.ShapefileRenderer;
 import org.geotools.styling.FeatureTypeStyle;
 import org.geotools.styling.Style;
 import org.geotools.styling.visitor.DuplicatingStyleVisitor;
@@ -292,7 +291,7 @@
 		 * SK 9.7.09: It's not enought to user LabelCache.clear(). We can not
 		 * reuse the old Renderer - better to create a new one!
 		 */
-		final GTRenderer newRenderer = GTUtil.createGTRenderer(oldRenderer.getContext());
+		final GTRenderer newRenderer = GTUtil.createGTRenderer();
 
 		final HashMap<Object, Object> rendererHints = defaultGTRenderingHints;
 		rendererHints.put(StreamingRenderer.LABEL_CACHE_KEY,