[Schmitzm-commits] r512 - in branches/1.0-gt2-2.6/src: gtmig/org/geotools/swing schmitzm/jfree/chart/renderer

[scm-commit@wald.intevation.org]

Author: mojays
Date: 2009-11-06 16:00:17 +0100 (Fri, 06 Nov 2009)
New Revision: 512

Modified:
   branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/XMapPane.java
   branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/renderer/PointSelectionXYRenderer.java
Log:
until gt2-2.6.1 is released:
Import of gt-RenderingExecutor replaced by import of skrueger-RenderingExecutor in XMapPane

Modified: branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/XMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/XMapPane.java	2009-11-05 17:41:33 UTC (rev 511)
+++ branches/1.0-gt2-2.6/src/gtmig/org/geotools/swing/XMapPane.java	2009-11-06 15:00:17 UTC (rev 512)
@@ -68,7 +68,8 @@
 import org.geotools.renderer.label.LabelCacheImpl;
 import org.geotools.renderer.lite.LabelCache;
 import org.geotools.swing.JMapPane;
-import org.geotools.swing.RenderingExecutor;
+//import org.geotools.swing.RenderingExecutor;  // gt2-2.6.1
+import skrueger.geotools.RenderingExecutor;     // until gt2-2.6.1
 import org.geotools.swing.event.MapMouseEvent;
 import org.geotools.swing.event.MapPaneEvent;
 import org.geotools.swing.event.MapPaneListener;
@@ -177,7 +178,7 @@
 
 	public static final long DEFAULT_REPAINTING_DELAY = 200;
 
-	protected skrueger.geotools.RenderingExecutor bgExecuter;
+	protected RenderingExecutor bgExecuter;
 
 	/**
 	 * the map context to render
@@ -1088,7 +1089,7 @@
 
 	public static final int NONE = -123;
 
-	private skrueger.geotools.RenderingExecutor localExecuter;
+	private RenderingExecutor localExecuter;
 
 	private BufferedImage finalImage;
 
@@ -1463,7 +1464,7 @@
 		 */
 
 		if (getBgContext() != null) {
-			bgExecuter = new skrueger.geotools.RenderingExecutor(this);
+			bgExecuter = new RenderingExecutor(this);
 			LOGGER.debug("starting bg renderer:");
 			// /* System.out.println("rendering"); */
 			final GTRenderer createGTRenderer = GTUtil.createGTRenderer(
@@ -1474,7 +1475,7 @@
 		}
 
 		if (getContext() != null) {
-			localExecuter = new skrueger.geotools.RenderingExecutor(this);
+			localExecuter = new RenderingExecutor(this);
 			LOGGER.debug("starting local renderer:");
 			final GTRenderer createGTRenderer = GTUtil.createGTRenderer(
 					localContext, getRendererHints());

Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/renderer/PointSelectionXYRenderer.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/renderer/PointSelectionXYRenderer.java	2009-11-05 17:41:33 UTC (rev 511)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/renderer/PointSelectionXYRenderer.java	2009-11-06 15:00:17 UTC (rev 512)
@@ -280,11 +280,10 @@
         Comparable<?> seriesKey = dataset.getSeriesKey(series);
         if ( selectionModel.isItemSelected(seriesKey, item) ) {
           setSeriesPaint( series, selPaint, false );
+         
+          if (getSelectionOutlinePaint() != null)
+            setSeriesOutlinePaint(series, selectionOutlinePaint, false );
           
-          if (getSelectionOutlinePaint() != null) {
-        	  setSeriesOutlinePaint(series, selectionOutlinePaint, false );
-          }
-          
           super.drawItem(g, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
         }
       } else