# HG changeset patch # User Felix Wolfsteller # Date 1349170758 -7200 # Node ID e1691b74f3aa888fe7b2cf78a4be3678abe6da45 # Parent 87aafd2c643a8aca48110b7da4968382ee4222ae Let AnnotationFacet have name of type, if type was chosen. diff -r 87aafd2c643a -r e1691b74f3aa flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Tue Oct 02 10:47:44 2012 +0200 +++ b/flys-artifacts/ChangeLog Tue Oct 02 11:39:18 2012 +0200 @@ -1,3 +1,8 @@ +2012-10-02 Felix Wolfsteller + + * flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java: + If type of annotation was chosen, give facet name of type. + 2012-10-02 Felix Wolfsteller * flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java diff -r 87aafd2c643a -r e1691b74f3aa flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java Tue Oct 02 10:47:44 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/AnnotationRiverState.java Tue Oct 02 11:39:18 2012 +0200 @@ -8,6 +8,7 @@ import de.intevation.artifactdatabase.state.Facet; +import de.intevation.flys.artifacts.AnnotationArtifact; import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.model.AnnotationFacet; @@ -51,10 +52,17 @@ ) { logger.debug("AnnotationRiverState.computeInit()"); + AnnotationArtifact annotationArtifact = (AnnotationArtifact) artifact; + + String facetName = annotationArtifact.getFilterName(); + if (facetName == null) { + facetName = Resources.getMsg(meta, I18N_DESCRIPTION, I18N_DESCRIPTION); + } + AnnotationFacet facet = new AnnotationFacet( 0, LONGITUDINAL_ANNOTATION, - Resources.getMsg(meta, I18N_DESCRIPTION, I18N_DESCRIPTION)); + facetName); facets.add(facet); return null;