Mercurial > dive4elements > river
changeset 4048:6ed8ebd48d6e
Removed dead code.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Sat, 06 Oct 2012 11:14:23 +0200 |
parents | 3dc26ec2558d |
children | 8e66293c5369 |
files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationsFactory.java flys-artifacts/src/main/java/de/intevation/flys/jfree/CollisionFreeXYTextAnnotation.java flys-artifacts/src/main/java/de/intevation/flys/jfree/StickyAxisAnnotation.java |
diffstat | 5 files changed, 11 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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);
--- 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;
--- 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"); } + */ } /**
--- 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". */