Mercurial > dive4elements > river
changeset 3280:4a70525c5b0d
Removed trailing whitespace.
flys-artifacts/trunk@4933 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Wed, 11 Jul 2012 11:25:42 +0000 |
| parents | 5a7b4f890d53 |
| children | 3c61d9e64ca0 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DateRange.java flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java |
| diffstat | 5 files changed, 28 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Jul 11 10:53:38 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Jul 11 11:25:42 2012 +0000 @@ -1,3 +1,11 @@ +2012-07-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/DateRange.java, + src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java, + src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java, + src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: + Removed trailing whitespace. + 2012-07-11 Christian Lins <christian.lins@intevation.de> * src/main/java/de/intevation/flys/artifacts/model/DateRange.java,
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java Wed Jul 11 10:53:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/access/FixationArtifactAccess.java Wed Jul 11 11:25:42 2012 +0000 @@ -204,17 +204,17 @@ return analysisPeriods; } - + /** * @return DateRange object ranging from eldest to youngest date * of analysis and reference periods. */ public DateRange getDateRange() { DateRange refP = getReferencePeriod(); - + Date from = refP.getFrom(); Date to = refP.getTo(); - + DateRange[] rs = getAnalysisPeriods(); for(DateRange r : rs) { if(r.getFrom().before(from)) { @@ -224,7 +224,7 @@ to = r.getTo(); } } - + return new DateRange(from, to); }
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DateRange.java Wed Jul 11 10:53:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DateRange.java Wed Jul 11 11:25:42 2012 +0000 @@ -7,7 +7,7 @@ implements Serializable { private static final long serialVersionUID = -2553914795388094818L; - + protected Date from; protected Date to;
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java Wed Jul 11 10:53:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java Wed Jul 11 11:25:42 2012 +0000 @@ -158,11 +158,11 @@ return new Color(255, 0, 0); } } - + @Override protected void addAnnotationsToRenderer(XYPlot plot) { super.addAnnotationsToRenderer(plot); - + // Paints for the boxes/lines. Stroke basicStroke = new BasicStroke(1.0f); @@ -174,14 +174,14 @@ ChartArea area = new ChartArea( plot.getDomainAxis(0).getRange(), plot.getRangeAxis().getRange()); - + for(FLYSAnnotation fa : this.annotations) { - + // Access text styling, if any. Document theme = fa.getTheme(); ThemeAccess.TextStyle textStyle = null; ThemeAccess.LineStyle lineStyle = null; - + // Get Themeing information and add legend item. if (theme != null) { ThemeAccess themeAccess = new ThemeAccess(theme); @@ -201,25 +201,25 @@ plot.setFixedLegendItems(old); } } - + // Hyks. for (HYKFactory.Zone zone: fa.getBoxes()) { // For each zone, create a box to fill with color, a box to draw // the lines and a text to display the type. fillPaint = colorForHYKZone(zone.getName()); - + XYBoxAnnotation boxA = new XYBoxAnnotation(zone.getFrom(), area.atGround(), zone.getTo(), area.ofGround(0.03f), basicStroke, tranPaint, fillPaint); XYBoxAnnotation boxB = new XYBoxAnnotation(zone.getFrom(), area.atGround(), zone.getTo(), area.atTop(), basicStroke, fillPaint, tranPaint); - + XYTextAnnotation tex = new XYTextAnnotation(zone.getName(), zone.getFrom() + (zone.getTo() - zone.getFrom()) / 1.0d, area.ofGround(0.015f)); if (textStyle != null) { textStyle.apply(tex); } - + plot.getRenderer().addAnnotation(boxA, org.jfree.ui.Layer.BACKGROUND); plot.getRenderer().addAnnotation(boxB, org.jfree.ui.Layer.BACKGROUND); plot.getRenderer().addAnnotation(tex, org.jfree.ui.Layer.BACKGROUND);
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Wed Jul 11 10:53:38 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Wed Jul 11 11:25:42 2012 +0000 @@ -77,8 +77,8 @@ idx = c; } } - - + + private FLYSArtifact artifact = null; @@ -110,9 +110,9 @@ FixationArtifactAccess access = new FixationArtifactAccess(artifact); DateRange range = access.getDateRange(); return Resources.format( - context.getMeta(), - I18N_CHART_SUBTITLE, - "", + context.getMeta(), + I18N_CHART_SUBTITLE, + "", access.getRiver(), range.getFrom(), range.getTo()); @@ -160,7 +160,7 @@ String name = artifactFacet.getFacetName(); logger.debug("FixDeltaWtGenerator.doOut: " + name); logger.debug("Theme description is: " + artifactFacet.getFacetDescription()); - + this.artifact = (FLYSArtifact)artifactFacet.getArtifact(); if (name.contains(FIX_SECTOR_AVERAGE_DWT)) {