diff flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java @ 2161:c68f4f227c09

Somewhat unified Annotation handling, use jfreechart-house-toolkit instead of custom StickyAxisAnnotation. flys-artifacts/trunk@3747 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Mon, 23 Jan 2012 10:44:34 +0000
parents c4ceade9d50e
children 0b8c04c7f762
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java	Mon Jan 23 07:55:17 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java	Mon Jan 23 10:44:34 2012 +0000
@@ -6,9 +6,6 @@
 
 import java.awt.Shape;
 import java.awt.geom.Rectangle2D;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.BasicStroke;
 
 import org.jfree.chart.annotations.XYTextAnnotation;
 import org.jfree.chart.axis.ValueAxis;
@@ -22,7 +19,6 @@
 
 import org.jfree.ui.RectangleEdge;
 
-import de.intevation.flys.utils.ThemeAccess;
 
 /**
  * Custom Annotations class that is drawn only if no collisions with other
@@ -34,7 +30,8 @@
     private static Logger logger =
         Logger.getLogger(CollisionFreeXYTextAnnotation.class);
 
-    public CollisionFreeXYTextAnnotation(String text, float x, double y) {
+
+    public CollisionFreeXYTextAnnotation(String text, double x, double y) {
         super(text, x, y);
     }
 
@@ -88,6 +85,7 @@
 
         // Deviation from superclass: prevent collision.
         Rectangle2D hotspotBox = hotspot.getBounds2D();
+
         for (Iterator i = info.getOwner().getEntityCollection().iterator();
                 i.hasNext(); ) {
             Object next = i.next();
@@ -125,18 +123,5 @@
                 "CollisionFreeXYTextAnnotation");
         }
     }
-
-
-    /*
-    public void applyTheme(ThemeAccess ta) {
-        lineWidth       = ta.parseLineWidth();
-        lineColor       = ta.parseLineColorField();
-        textColor       = ta.parseTextColor();
-        font            = ta.parseTextFont();
-        textOrientation = ta.parseTextOrientation();
-        textBackground  = ta.parseTextBackground();
-        showBackground  = ta.parseShowTextBackground();
-    }
-    */
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org