Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java @ 9123:1cc7653ca84f
Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
author | gernotbelger |
---|---|
date | Tue, 05 Jun 2018 19:21:16 +0200 |
parents | 5e38e2924c07 |
children | 094ed9d1f2ad |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java Tue Jun 05 19:10:38 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java Tue Jun 05 19:21:16 2018 +0200 @@ -106,24 +106,24 @@ @Override - protected String getDefaultChartTitle() { + protected String getDefaultChartTitle(final CallContext context) { return msg(I18N_CHART_TITLE, I18N_CHART_TITLE); } @Override - protected String getChartTitle() { + protected String getChartTitle(final CallContext context) { return Resources.format( context.getMeta(), I18N_CHART_TITLE, "", FixChartGenerator - .getCurrentKmFromRequest(request).doubleValue()); + .getCurrentKmFromRequest(getRequest()).doubleValue()); } @Override - protected String getDefaultChartSubtitle() { + protected String getDefaultChartSubtitle(final CallContext context) { FixAnalysisAccess access = new FixAnalysisAccess(artifact); DateRange dateRange = access.getDateRange(); DateRange refRange = access.getReferencePeriod(); @@ -140,7 +140,7 @@ @Override - protected String getDefaultXAxisLabel() { + protected String getDefaultXAxisLabel(final CallContext context) { return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL); } @@ -171,6 +171,8 @@ this.artifact = (D4EArtifact)artifactFacet.getArtifact(); + final CallContext context = getContext(); + if (name.contains(FIX_SECTOR_AVERAGE_DWT)) { doSectorAverageOut( (D4EArtifact) artifactFacet.getArtifact(), @@ -388,10 +390,10 @@ return; } - Locale locale = Resources.getLocale(context.getMeta()); + Locale locale = Resources.getLocale(getContext().getMeta()); NumberFormat nf = NumberFormat.getInstance(locale); - List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>(); + List<XYTextAnnotation> textAnnos = new ArrayList<>(); for (int[] idxs: annoIdxMap.values()) {