Mercurial > dive4elements > river
changeset 4149:71a4b664a16a
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 16 Oct 2012 11:36:21 +0200 |
| parents | 1ba0927855b4 (diff) 5589b1fd459d (current diff) |
| children | 0f60efc39953 |
| files | |
| diffstat | 5 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Tue Oct 16 11:28:33 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Tue Oct 16 11:36:21 2012 +0200 @@ -113,6 +113,7 @@ facets = new HashMap<String, List<Facet>>(); } + /** * This method appends the static data - that has already been inserted by * the user - to the static node of the DESCRIBE document. @@ -258,6 +259,7 @@ return copy; } + /** * Return a copy of the facet mapping. * @return Mapping of state-ids to facets. @@ -411,6 +413,7 @@ return doc; } + /** * This method returns a description of this artifact. *
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Tue Oct 16 11:28:33 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Tue Oct 16 11:36:21 2012 +0200 @@ -55,6 +55,7 @@ extends FixChartGenerator implements FacetTypes { + /** Private logger. */ private static Logger logger = Logger.getLogger(FixWQCurveGenerator.class); @@ -92,6 +93,7 @@ } + /** Needed to access data to create subtitle. */ private FLYSArtifact artifact; @@ -365,13 +367,13 @@ Double ckm = (Double) context.getContextValue(CURRENT_KM); double location = (ckm != null) ? ckm.doubleValue() - : getRange()[0]; - double w = StaticWKmsArtifact.getWAtKmLin(data, location); - xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), - (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS)); + : getRange()[0]; + double w = StaticWKmsArtifact.getWAtKmLin(data, location); + xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), + (float) w, StickyAxisAnnotation.SimpleAxis.Y_AXIS)); - doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), - aandf, theme, visible); + doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), + aandf, theme, visible); } }
--- a/flys-client/ChangeLog Tue Oct 16 11:28:33 2012 +0200 +++ b/flys-client/ChangeLog Tue Oct 16 11:36:21 2012 +0200 @@ -1,3 +1,8 @@ +2012-10-16 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java: + Do not crash when input helper is used in non-Fixation settings. + 2012-10-15 Björn Ricks <bjoern.ricks@intevation.de> * src/main/java/de/intevation/flys/client/client/FLYS.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java Tue Oct 16 11:28:33 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java Tue Oct 16 11:36:21 2012 +0200 @@ -146,6 +146,10 @@ createCallback(); String callBack = "fixationCallback(this.checked, this.name)"; + + if (this.artifact instanceof FixAnalysisArtifact == false) + return chartContainer; + FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; overviewService.generateOverview(
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetRecord.java Tue Oct 16 11:28:33 2012 +0200 +++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/FacetRecord.java Tue Oct 16 11:36:21 2012 +0200 @@ -8,6 +8,7 @@ */ public class FacetRecord extends ListGridRecord { + /** Underlying theme. */ protected Theme theme;