--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java	Sat Oct 06 11:08:24 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java	Sat Oct 06 11:14:23 2012 +0200
@@ -1,7 +1,5 @@
 package de.intevation.flys.jfree;
 
-import org.apache.log4j.Logger;
-
 import java.awt.Shape;
 import java.awt.geom.Rectangle2D;
 
@@ -24,11 +22,6 @@
  */
 public class CollisionFreeXYTextAnnotation extends XYTextAnnotation {
 
-    /** Logger for this class. */
-    private static Logger logger =
-        Logger.getLogger(CollisionFreeXYTextAnnotation.class);
-
-
     public CollisionFreeXYTextAnnotation(String text, double x, double y) {
         super(text, x, y);
     }
@@ -82,8 +75,6 @@
                 getRotationAngle(), getRotationAnchor());
 
         // Deviation from superclass: prevent collision.
-        Rectangle2D hotspotBox = hotspot.getBounds2D();
-
         if (JFreeUtil.collides(hotspot, info.getOwner().getEntityCollection(),
             XYAnnotationEntity.class)) {
             return;
@@ -110,11 +101,14 @@
         if (toolTip != null || url != null) {
             addEntity(info, hotspot, rendererIndex, toolTip, url);
         }
+        // XXX: DEAD CODE (as long as a hard value is assigned to toolTip
+        /*
         else {
             addEntity(info, hotspot, rendererIndex,
                 "CollisionFreeXYTextAnnotation",
                 "CollisionFreeXYTextAnnotation");
         }
+        */
     }
 
     /**