--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java	Tue Jun 05 14:56:57 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java	Tue Jun 05 15:03:11 2012 +0000
@@ -20,6 +20,8 @@
 
 import org.jfree.ui.RectangleEdge;
 
+import de.intevation.flys.jfree.JFreeUtil;
+
 
 /**
  * Custom Annotations class that is drawn only if no collisions with other
@@ -87,17 +89,9 @@
         // Deviation from superclass: prevent collision.
         Rectangle2D hotspotBox = hotspot.getBounds2D();
 
-        for (Iterator i = info.getOwner().getEntityCollection().iterator();
-                i.hasNext(); ) {
-            Object next = i.next();
-            // Collision with other stuff than XYAnnotations are okay.
-            if (next instanceof CollisionFreeXYTextAnnotationEntity) {
-                XYAnnotationEntity drawnShape = (XYAnnotationEntity) next;
-                if (drawnShape.getArea().intersects(hotspotBox)) {
-                    // Found collision, early stop.
-                    return;
-                }
-            }
+        if (JFreeUtil.collides(hotspot, info.getOwner().getEntityCollection(),
+            XYAnnotationEntity.class)) {
+            return;
         }
 
         if (this.getBackgroundPaint() != null) {