comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java @ 2792:fe987587ebc9

Merged revisions 4539-4540,4543,4545-4546 via svnmerge from file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk ........ r4539 | teichmann | 2012-05-27 20:02:13 +0200 (So, 27 Mai 2012) | 1 line FixA: Added forgotten csv/report facets/generators to conf. ........ r4540 | teichmann | 2012-05-27 20:11:31 +0200 (So, 27 Mai 2012) | 1 line FixA: Fixed class cast bug in report facet. ........ r4543 | teichmann | 2012-05-28 20:35:01 +0200 (Mo, 28 Mai 2012) | 1 line FixA: Added facet to return delta w/t as CSV ........ r4545 | teichmann | 2012-05-28 22:59:27 +0200 (Mo, 28 Mai 2012) | 1 line FixA: Made Delta W/t calculation finally work ........ r4546 | teichmann | 2012-05-28 23:34:24 +0200 (Mo, 28 Mai 2012) | 1 line FixA: corrected fitting (Q->W instead W->Q). ........ flys-artifacts/tags/2.7@4547 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 29 May 2012 04:58:29 +0000
parents 156214e3ca55
children 77b5f5a26700
comparison
equal deleted inserted replaced
2791:c9815016a3bb 2792:fe987587ebc9
6 6
7 import de.intevation.flys.artifacts.FLYSArtifact; 7 import de.intevation.flys.artifacts.FLYSArtifact;
8 import de.intevation.flys.artifacts.FixationArtifactAccess; 8 import de.intevation.flys.artifacts.FixationArtifactAccess;
9 9
10 import de.intevation.flys.artifacts.model.CalculationResult; 10 import de.intevation.flys.artifacts.model.CalculationResult;
11 import de.intevation.flys.artifacts.model.DataFacet;
12 import de.intevation.flys.artifacts.model.FacetTypes;
11 import de.intevation.flys.artifacts.model.ReportFacet; 13 import de.intevation.flys.artifacts.model.ReportFacet;
12 14
13 import de.intevation.flys.artifacts.model.fixings.FixCalculation; 15 import de.intevation.flys.artifacts.model.fixings.FixCalculation;
14 16
15 import de.intevation.flys.artifacts.states.DefaultState; 17 import de.intevation.flys.artifacts.states.DefaultState;
19 import org.apache.log4j.Logger; 21 import org.apache.log4j.Logger;
20 22
21 /** 23 /**
22 * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> 24 * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a>
23 */ 25 */
24 public class FixationCompute extends DefaultState { 26 public class FixationCompute
27 extends DefaultState
28 implements FacetTypes
29 {
25 30
26 /** The log used in this class. */ 31 /** The log used in this class. */
27 private static Logger log = Logger.getLogger(FixationCompute.class); 32 private static Logger log = Logger.getLogger(FixationCompute.class);
28 33
29 34
63 } 68 }
64 69
65 if (res.getReport().hasProblems()) { 70 if (res.getReport().hasProblems()) {
66 facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); 71 facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id));
67 } 72 }
73 facets.add(
74 new DataFacet(CSV, "CSV data", ComputeType.ADVANCE, hash, id));
68 75
69 return res; 76 return res;
70 } 77 }
71 } 78 }
72 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : 79 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :

http://dive4elements.wald.intevation.org