Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java @ 9617:1d4262a68f1f
#12 Minuend/Subtrahend + MergeConflict #19 CollisionCalculation
author | dnt_bjoernsen <d.tironi@bjoernsen.de> |
---|---|
date | Thu, 10 Oct 2019 15:29:02 +0200 |
parents | 9b8e8fc1f408 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java Wed Oct 09 19:25:55 2019 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java Thu Oct 10 15:29:02 2019 +0200 @@ -11,80 +11,58 @@ import java.util.Map; import org.apache.log4j.Logger; -import org.jfree.data.xy.XYSeries; - import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.artifacts.CallMeta; - -import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.exports.XYChartGenerator; +import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.exports.DiagramGenerator; import org.dive4elements.river.exports.StyledSeriesBuilder; +import org.dive4elements.river.exports.XYChartGenerator; import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.themes.ThemeDocument; +import org.jfree.data.xy.XYSeries; public class BedHeightProcessor extends DefaultProcessor { - private final static Logger log = - Logger.getLogger(BedHeightProcessor.class); + private final static Logger log = Logger.getLogger(BedHeightProcessor.class); - public static final String I18N_AXIS_LABEL = - "chart.bedheight_middle.section.yaxis.label"; + public static final String I18N_AXIS_LABEL = "chart.bedheight_middle.section.yaxis.label"; public final static String FACET_BED_HEIGHTS_MIN = "bedheight_min"; public final static String FACET_BED_HEIGHTS_MAX = "bedheight_min"; - + protected static final double GAP_TOLERANCE = 0.101d; protected String yAxisLabel; @Override - public void doOut( - DiagramGenerator generator, - ArtifactAndFacet bundle, - ThemeDocument theme, - boolean visible) { - XYSeries series = prepareSeries( - bundle, theme, generator.getContext()); + public void doOut(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { + final XYSeries series = prepareSeries(bundle, theme, generator.getContext()); if (series != null) { - generator.addAxisSeries(series, axisName, visible); + generator.addAxisSeries(series, this.axisName, visible); } } @Override - public void doOut( - XYChartGenerator generator, - ArtifactAndFacet bundle, - ThemeDocument theme, - boolean visible, - int index - ) { - XYSeries series = prepareSeries( - bundle, theme, generator.getContext()); + public void doOut(final XYChartGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible, final int index) { + final XYSeries series = prepareSeries(bundle, theme, generator.getContext()); if (series != null) { generator.addAxisSeries(series, index, visible); } } /** Prepare an series, independent of axis. */ - private XYSeries prepareSeries( - ArtifactAndFacet bundle, - ThemeDocument theme, - CallContext context - ) { - Map<String, String> metaData = bundle.getFacet().getMetaData( - bundle.getArtifact(), context); - StyledXYSeries series = new StyledXYSeries(bundle.getFacetName(), bundle.getFacetDescription(), - theme); + private XYSeries prepareSeries(final ArtifactAndFacet bundle, final ThemeDocument theme, final CallContext context) { + final Map<String, String> metaData = bundle.getFacet().getMetaData(bundle.getArtifact(), context); + final StyledXYSeries series = new StyledXYSeries(bundle.getFacetName(), bundle.getFacetDescription(), theme); series.putMetaData(metaData, bundle.getArtifact(), context); - yAxisLabel = metaData.get("Y"); + this.yAxisLabel = metaData.get("Y"); - Object raw = bundle.getData(context); + final Object raw = bundle.getData(context); if (raw == null) { return null; } @@ -93,44 +71,28 @@ return null; } - double[][] data = (double[][])raw; - StyledSeriesBuilder.addPoints(series, - data, - false, - GAP_TOLERANCE); + final double[][] data = (double[][]) raw; + StyledSeriesBuilder.addPoints(series, data, false, GAP_TOLERANCE); return series; } - @Override - public boolean canHandle(String facetType) { - return FacetTypes.BEDHEIGHT.equals(facetType) - || FACET_BED_HEIGHTS_MIN.equals(facetType) - || FACET_BED_HEIGHTS_MAX.equals(facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2.equals(facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED.equals( - facetType) - || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED.equals( - facetType); + public boolean canHandle(final String facetType) { + return FacetTypes.BEDHEIGHT.equals(facetType) || FACET_BED_HEIGHTS_MIN.equals(facetType) || FACET_BED_HEIGHTS_MAX.equals(facetType) + || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1.equals(facetType) || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2.equals(facetType) + || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED.equals(facetType) || FacetTypes.BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED.equals(facetType); } @Override - public String getAxisLabel(DiagramGenerator generator) { - D4EArtifact flys = (D4EArtifact) generator.getMaster(); - String unit = new RiverAccess(flys).getRiver().getWstUnit().getName(); - - CallMeta meta = generator.getContext().getMeta(); + public String getAxisLabel(final DiagramGenerator generator) { + final D4EArtifact flys = (D4EArtifact) generator.getMaster(); + final String unit = new RiverAccess(flys).getRiver().getWstUnit().getName(); - if (yAxisLabel != null && !yAxisLabel.isEmpty()) { - return Resources.getMsg( - meta, - yAxisLabel, - new Object[] {unit}); + final CallMeta meta = generator.getContext().getMeta(); + + if (this.yAxisLabel != null && !this.yAxisLabel.isEmpty()) { + return Resources.getMsg(meta, this.yAxisLabel, new Object[] { unit }); } - return Resources.getMsg( - meta, - I18N_AXIS_LABEL, - new Object[] { unit }); + return Resources.getMsg(meta, I18N_AXIS_LABEL, new Object[] { unit }); } } \ No newline at end of file