# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1349514863 -7200
# Node ID 6ed8ebd48d6edca4664f53fabd338aa17f18f40c
# Parent  3dc26ec2558da1865906a9a787c5512a0e3c28e4
Removed dead code.

diff -r 3dc26ec2558d -r 6ed8ebd48d6e flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Sat Oct 06 11:08:24 2012 +0200
+++ b/flys-artifacts/ChangeLog	Sat Oct 06 11:14:23 2012 +0200
@@ -1,3 +1,11 @@
+2012-10-06	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java,
+	  src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java,
+	  src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java,
+	  src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java:
+	  Removed dead code.
+
 2012-10-06	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* main/java/de/intevation/flys/exports/LegendProcessor.java:
diff -r 3dc26ec2558d -r 6ed8ebd48d6e flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Sat Oct 06 11:08:24 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java	Sat Oct 06 11:14:23 2012 +0200
@@ -169,11 +169,6 @@
     {
         List<String> stateIds = getPreviousStateIds();
 
-        XMLUtils.ElementCreator creator = new XMLUtils.ElementCreator(
-            doc,
-            ArtifactNamespaceContext.NAMESPACE_URI,
-            ArtifactNamespaceContext.NAMESPACE_PREFIX);
-
         FLYSContext flysContext = FLYSUtils.getFlysContext(context);
         StateEngine engine      = (StateEngine) flysContext.get(
             FLYSContext.STATE_ENGINE_KEY);
diff -r 3dc26ec2558d -r 6ed8ebd48d6e flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java	Sat Oct 06 11:08:24 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java	Sat Oct 06 11:14:23 2012 +0200
@@ -8,7 +8,6 @@
 
 import de.intevation.flys.backend.SessionHolder;
 import de.intevation.flys.model.Annotation;
-import de.intevation.flys.model.Range;
 import de.intevation.flys.model.River;
 
 import org.hibernate.Session;
diff -r 3dc26ec2558d -r 6ed8ebd48d6e flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java
--- 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");
         }
+        */
     }
 
     /**
diff -r 3dc26ec2558d -r 6ed8ebd48d6e flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java	Sat Oct 06 11:08:24 2012 +0200
+++ b/flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java	Sat Oct 06 11:14:23 2012 +0200
@@ -1,8 +1,5 @@
 package de.intevation.flys.jfree;
 
-import org.apache.log4j.Logger;
-
-
 /**
  * Custom Annotations class that is drawn only if no collisions with other
  * already drawn CustomAnnotations in current plot are found. A mark on
@@ -11,10 +8,6 @@
  */
 public class StickyAxisAnnotation {
 
-    /** Logger for this class. */
-    private static Logger logger =
-        Logger.getLogger(StickyAxisAnnotation.class);
-
     /** Simplified view on axes. */
     public static enum SimpleAxis {
         X_AXIS, /** Usually "horizontal". */