Mercurial > dive4elements > river
changeset 1077:3067e700fc13
Minor cosmetics and docs.
flys-artifacts/trunk@2574 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 25 Aug 2011 10:34:20 +0000 (2011-08-25) |
parents | 6ada2b84ddf8 |
children | 048517d67215 |
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/AnnotationFacet.java flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java |
diffstat | 4 files changed, 22 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Aug 25 10:29:14 2011 +0000 +++ b/flys-artifacts/ChangeLog Thu Aug 25 10:34:20 2011 +0000 @@ -1,3 +1,12 @@ +2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, + src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: + Cosmetics, docs. + + * src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java: + Cosmetics. + 2011-08-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Thu Aug 25 10:29:14 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Thu Aug 25 10:34:20 2011 +0000 @@ -56,8 +56,10 @@ //public static final String CACHE_NAME = "annotations"; @Override - protected void initialize(Artifact artifact, Object context, CallMeta meta) { - logger.debug("Initialize internal state of AnnotationArtifact with: " + artifact.identifier()); + protected void initialize(Artifact artifact, Object context, + CallMeta meta) { + logger.debug("AnnotationArtifact.initialize, id: " + + artifact.identifier()); FLYSArtifact flys = (FLYSArtifact) artifact; addData("river", flys.getData("river"));
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java Thu Aug 25 10:29:14 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java Thu Aug 25 10:34:20 2011 +0000 @@ -11,7 +11,7 @@ import de.intevation.artifactdatabase.state.Facet; /** - * Facet to access Annotations of a river. + * Facet to access Annotations (landmarks, POIs) of a river. */ public class AnnotationFacet extends DefaultFacet @@ -19,6 +19,10 @@ /** Logger for this class. */ private static final Logger logger = Logger.getLogger(AnnotationFacet.class); + + /** + * Trivial Constructor. + */ public AnnotationFacet() { } @@ -43,10 +47,11 @@ */ @Override public Object getData(Artifact artifact, CallContext context) { - AnnotationArtifact annotationArtifact = (AnnotationArtifact) artifact; + AnnotationArtifact annotationArtifact = (AnnotationArtifact) artifact; return annotationArtifact.getAnnotations(); } + @Override public Facet deepCopy() { AnnotationFacet copy = new AnnotationFacet();
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Thu Aug 25 10:29:14 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Thu Aug 25 10:34:20 2011 +0000 @@ -12,8 +12,8 @@ import org.jfree.chart.title.TextTitle; import org.jfree.data.Range; import org.jfree.data.xy.XYSeries; +import org.jfree.data.xy.XYSeriesCollection; import org.jfree.ui.TextAnchor; -import org.jfree.data.xy.XYSeriesCollection; import org.w3c.dom.Document; @@ -250,7 +250,7 @@ logger.debug("LongitudinalSectionGenerator.doAnnotationsOut"); this.annotations = (List<Annotation>) o; - // Add (empty) pseudo series. + // Add (empty) pseudo series to have legend entry for annotations. if (pseudoAnnotationData == null) { pseudoAnnotationData = new XYSeriesCollection(); }