[Schmitzm-commits] r227 - in trunk/src: org/geotools/renderer/shape schmitzm/geotools/gui skrueger/geotools

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-07-17 09:25:29 +0200 (Fri, 17 Jul 2009)
New Revision: 227

Modified:
   trunk/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java
   trunk/src/schmitzm/geotools/gui/JMapPane.java
   trunk/src/skrueger/geotools/MapView.java
Log:
* AV-Revert: Had to replace TransitionalShapefileRenderer again, because AR reported reproducable hangs on many Windows machines. 

* GP-Feature: Created an Export-Wizard! Check it out.. it's fun!


Modified: trunk/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java
===================================================================
--- trunk/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java	2009-07-16 07:37:43 UTC (rev 226)
+++ trunk/src/org/geotools/renderer/shape/TransitionShapefileRenderer.java	2009-07-17 07:25:29 UTC (rev 227)
@@ -1324,7 +1324,7 @@
 				if (layers[i].getQuery() != null
 						&& layers[i].getQuery().getFilter() instanceof FeatureOperationTreeFilter) {
 					layerIndexInfo[i] = STREAMING_RENDERER_INFO;
-					LOGGER.info("Fallback to StreamingRenderer because Filter is instanceof FeatureOperationTreeFilter!");
+//					LOGGER.info("Fallback to StreamingRenderer because Filter is instanceof FeatureOperationTreeFilter!");
 				} else {
 
 					ShapefileDataStore sds = (ShapefileDataStore) ds;

Modified: trunk/src/schmitzm/geotools/gui/JMapPane.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/JMapPane.java	2009-07-16 07:37:43 UTC (rev 226)
+++ trunk/src/schmitzm/geotools/gui/JMapPane.java	2009-07-17 07:25:29 UTC (rev 227)
@@ -370,7 +370,8 @@
     public JMapPane(LayoutManager layout, Boolean isDoubleBuffered,
             GTRenderer renderer, MapContext context) {
         super(layout != null ? layout : new BorderLayout(), isDoubleBuffered != null ? isDoubleBuffered : true,
-                renderer != null ? renderer : new TransitionShapefileRenderer(),
+//                renderer != null ? renderer : new TransitionShapefileRenderer(),
+                renderer != null ? renderer : new StreamingRenderer(),
                 context != null ? context : new DefaultMapContext(GTUtil.WGS84));
 
         // Dieser Hint sorgt wohl dafuer, dass die Rasterpixel nicht

Modified: trunk/src/skrueger/geotools/MapView.java
===================================================================
--- trunk/src/skrueger/geotools/MapView.java	2009-07-16 07:37:43 UTC (rev 226)
+++ trunk/src/skrueger/geotools/MapView.java	2009-07-17 07:25:29 UTC (rev 227)
@@ -35,16 +35,7 @@
 	 * dargestellt werden.
 	 */
 
-	/**
-	 * SK: 21.6.09: ShapeFileRenderer is supposed to be about 5x faster on
-	 * ShapeFiles. The ShapeFileRenderer falls back to the StreamingRenderer.
-	 */
-	// Old code:
-	// protected final GeoMapPane geoMapPane = new
-	// GeoMapPane(null,null,null,null, new StreamingRenderer());
-	// New Code uses Streaming renderer.
-	protected final GeoMapPane geoMapPane = new GeoMapPane(null, null, null,
-			null, new TransitionShapefileRenderer());
+	protected final GeoMapPane geoMapPane = new GeoMapPane();
 
 	private MapPaneToolBar jToolBar;