# HG changeset patch # User gernotbelger # Date 1535630984 -7200 # Node ID 7d7aa54afe0c06f0423f8b82506e211194fac7f4 # Parent a41f5f7c0b4ae20079411f71b6e45782cf48d1db little improvements diff -r a41f5f7c0b4a -r 7d7aa54afe0c artifacts/doc/conf/artifacts/bundu.xml --- a/artifacts/doc/conf/artifacts/bundu.xml Thu Aug 30 12:11:08 2018 +0200 +++ b/artifacts/doc/conf/artifacts/bundu.xml Thu Aug 30 14:09:44 2018 +0200 @@ -2,305 +2,312 @@ - + - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - + - - - + + + - - - + + + - - - - - - - - - - - + + - - + + - - + + - - + + + + + + + + + + + - + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - + - + - - + + - + - - + + - - + + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - + + - - - + + + - + @@ -320,185 +327,185 @@ - - - + + + - - - + + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - - + + + - - - + + + - - + + - - - + + + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - - - + + + - - + + - - - + + + - + - - - + + + @@ -507,48 +514,48 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + diff -r a41f5f7c0b4a -r 7d7aa54afe0c artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Thu Aug 30 12:11:08 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Thu Aug 30 14:09:44 2018 +0200 @@ -127,6 +127,7 @@ facets.add(new FixReferenceEventsFacet(facetIndex++, event.getColumnId(), FIX_EVENTS, facetDescription, stationRange)); } + facets.add(new DataFacet(FIX_PARAMETERS, "parameters", ComputeType.ADVANCE, hash, this.id)); facets.add(new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, stateId)); facets.add(new DataFacet(WST, "WST data", ComputeType.ADVANCE, hash, stateId)); facets.add(new DataFacet(PDF, "PDF data", ComputeType.ADVANCE, hash, stateId)); diff -r a41f5f7c0b4a -r 7d7aa54afe0c artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java Thu Aug 30 12:11:08 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/ParametersExporter.java Thu Aug 30 14:09:44 2018 +0200 @@ -8,100 +8,87 @@ package org.dive4elements.river.exports.fixings; -import au.com.bytecode.opencsv.CSVWriter; - -import org.dive4elements.river.artifacts.model.CalculationResult; -import org.dive4elements.river.artifacts.model.Parameters; - -import org.dive4elements.river.artifacts.model.fixings.FixAnalysisResult; - -import org.dive4elements.river.artifacts.resources.Resources; - -import org.dive4elements.river.exports.AbstractExporter; - import java.io.IOException; import java.io.OutputStream; - import java.text.NumberFormat; - import java.util.ArrayList; import java.util.List; import org.apache.log4j.Logger; +import org.dive4elements.river.artifacts.model.CalculationResult; +import org.dive4elements.river.artifacts.model.Parameters; +import org.dive4elements.river.artifacts.model.fixings.FixResult; +import org.dive4elements.river.artifacts.resources.Resources; +import org.dive4elements.river.exports.AbstractExporter; -public class ParametersExporter -extends AbstractExporter -{ +import au.com.bytecode.opencsv.CSVWriter; + +public class ParametersExporter extends AbstractExporter { private static Logger log = Logger.getLogger(ParametersExporter.class); protected List parametersList; public ParametersExporter() { - parametersList = new ArrayList(); + this.parametersList = new ArrayList<>(); } @Override - protected void addData(Object d) { + protected void addData(final Object d) { log.debug("ParametersExporter.addData"); if (!(d instanceof CalculationResult)) { log.warn("Invalid data type"); return; } - Object data = ((CalculationResult)d).getData(); - if (!(data instanceof FixAnalysisResult)) { + final Object data = ((CalculationResult) d).getData(); + if (!(data instanceof FixResult)) { log.warn("Invalid data stored in result."); return; } - FixAnalysisResult result = (FixAnalysisResult)data; - parametersList.add(result.getParameters()); + final FixResult result = (FixResult) data; + this.parametersList.add(result.getParameters()); } @Override - public void generate() - throws IOException - { + public void generate() throws IOException { log.debug("ParametersExporter.generate"); - if (facet == null) { + if (this.facet == null) { throw new IOException("invalid (null) facet for exporter"); } - if (facet.equals(FIX_PARAMETERS)) { + if (this.facet.equals(FIX_PARAMETERS)) { generateCSV(); - } - else { - throw new IOException( - "invalid facet for exporter: '" + facet + "'"); + } else { + throw new IOException("invalid facet for exporter: '" + this.facet + "'"); } } @Override protected void writeCSVData(final CSVWriter writer) throws IOException { - if (parametersList.isEmpty()) { + if (this.parametersList.isEmpty()) { return; } - Parameters parameters = parametersList.get(0); + final Parameters parameters = this.parametersList.get(0); writer.writeNext(parameters.getColumnNames()); final int numColumns = parameters.getNumberColumns(); parameters.visit(new Parameters.Visitor() { - String [] row = new String[numColumns]; + String[] row = new String[numColumns]; - NumberFormat format = NumberFormat.getInstance( - Resources.getLocale(context.getMeta())); + NumberFormat format = NumberFormat.getInstance(Resources.getLocale(ParametersExporter.this.context.getMeta())); @Override - public void visit(double [] data) { + public void visit(final double[] data) { for (int i = 0; i < data.length; ++i) { - row[i] = format.format(data[i]); + this.row[i] = this.format.format(data[i]); } - writer.writeNext(row); + writer.writeNext(this.row); } }, new double[numColumns]); @@ -109,7 +96,7 @@ } @Override - protected void writePDF(OutputStream out) { + protected void writePDF(final OutputStream out) { // TODO: Implement me! } }