Mercurial > dive4elements > river
changeset 4237:640adb7bced5
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 24 Oct 2012 14:27:21 +0200 |
| parents | 6942a8b31d95 (diff) d952372e7083 (current diff) |
| children | 50273de4cf63 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java Wed Oct 24 08:04:20 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WaterlevelArtifact.java Wed Oct 24 14:27:21 2012 +0200 @@ -64,7 +64,7 @@ List<Facet> list = new ArrayList<Facet>(); List<Facet> wlist = filterFacets.get("longitudinal_section"); for (Facet f: wlist) { - if (!f.getName().equals("longitudinal_section.q")) { + if (!f.getName().equals(LONGITUDINAL_Q)) { DefaultFacet df = new DefaultFacet(f.getIndex(), "longitudinal_section.q", ""); list.add(df);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Wed Oct 24 08:04:20 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Wed Oct 24 14:27:21 2012 +0200 @@ -74,7 +74,7 @@ /** - * Returns the data this facet requires. + * Returns the data this facet provides. * * @param artifact the owner artifact. * @param context the CallContext (ignored). @@ -85,7 +85,7 @@ public Object getData(Artifact artifact, CallContext context) { MainValuesArtifact mvArtifact = (MainValuesArtifact) artifact; - List<NamedDouble> ws = mvArtifact.getMainValuesW(isAtGauge); + List<NamedDouble> ws = mvArtifact.getMainValuesW(isAtGauge); List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>(); // Find whether a duration curve is on the blackboard.
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Oct 24 08:04:20 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java Wed Oct 24 14:27:21 2012 +0200 @@ -617,7 +617,7 @@ annotations.setLabel(aandf.getFacetDescription()); } else { - logger.debug( + logger.error( "Art/Facet for Annotations is null. " + "This should never happen!"); }