comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java @ 3785:a5f65e8983be

Merged revisions 5501-5502,5504-5508,5511-5513,5516-5519 via svnmerge from file:///home/clients/bsh/bsh-generischer-viewer/Material/SVN/flys-artifacts/trunk ........ r5501 | felix | 2012-09-18 11:49:45 +0200 (Di, 18 Sep 2012) | 1 line fix issue865 - missing showarea theme prop. ........ r5502 | clins | 2012-09-18 12:18:30 +0200 (Di, 18 Sep 2012) | 1 line Add robustness checks to prevent NPEs ........ r5504 | felix | 2012-09-18 14:03:15 +0200 (Di, 18 Sep 2012) | 1 line i18n for area label (fix issue487). ........ r5505 | clins | 2012-09-18 16:19:59 +0200 (Di, 18 Sep 2012) | 1 line Update themes to show point descriptions ........ r5506 | rrenkert | 2012-09-18 17:00:30 +0200 (Di, 18 Sep 2012) | 3 lines Removed incorrect characteristic diameter. ........ r5507 | rrenkert | 2012-09-18 17:03:20 +0200 (Di, 18 Sep 2012) | 3 lines Fixed some stupid bugs in bed quality data factory and calculation. ........ r5508 | teichmann | 2012-09-18 17:45:49 +0200 (Di, 18 Sep 2012) | 1 line The usual whitespace and import cleanups. ........ r5511 | teichmann | 2012-09-18 18:24:51 +0200 (Di, 18 Sep 2012) | 1 line Use generics aware Collections.emptyList(). ........ r5512 | teichmann | 2012-09-18 20:36:52 +0200 (Di, 18 Sep 2012) | 1 line Some more little steps towards "Auslagerung extremer Wasserspiegellagen". ........ r5513 | clins | 2012-09-18 23:38:19 +0200 (Di, 18 Sep 2012) | 1 line A and B facets of fix analyis are now deactivated by default ........ r5516 | bricks | 2012-09-19 10:45:51 +0200 (Mi, 19 Sep 2012) | 2 lines Add the gauge station to the GaugeOverviewInfoService xml response ........ r5517 | rrenkert | 2012-09-19 10:50:23 +0200 (Mi, 19 Sep 2012) | 3 lines Added CSV export to bed quality calculation. ........ r5518 | bricks | 2012-09-19 11:04:04 +0200 (Mi, 19 Sep 2012) | 2 lines Fix date in changelog entry ........ r5519 | teichmann | 2012-09-19 11:17:14 +0200 (Mi, 19 Sep 2012) | 1 line Removed trailing whitespace. ........ flys-artifacts/tags/2.9.1@5531 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Wed, 19 Sep 2012 14:58:31 +0000
parents 487a8cb4a222
children 9a2c38fb5f29
comparison
equal deleted inserted replaced
3784:9f9d5ada96ca 3785:a5f65e8983be
5 import java.util.List; 5 import java.util.List;
6 6
7 import org.apache.log4j.Logger; 7 import org.apache.log4j.Logger;
8 8
9 import de.intevation.artifactdatabase.state.Facet; 9 import de.intevation.artifactdatabase.state.Facet;
10 import de.intevation.artifactdatabase.state.FacetActivity;
11 import de.intevation.artifacts.Artifact;
10 import de.intevation.artifacts.CallContext; 12 import de.intevation.artifacts.CallContext;
11 import de.intevation.flys.artifacts.FLYSArtifact; 13 import de.intevation.flys.artifacts.FLYSArtifact;
12 import de.intevation.flys.artifacts.access.FixAnalysisAccess; 14 import de.intevation.flys.artifacts.access.FixAnalysisAccess;
13 import de.intevation.flys.artifacts.model.CalculationResult; 15 import de.intevation.flys.artifacts.model.CalculationResult;
14 import de.intevation.flys.artifacts.model.DataFacet; 16 import de.intevation.flys.artifacts.model.DataFacet;
62 "[(MNQ+MQ)/2 - (MQ+MHQ)/2)", 64 "[(MNQ+MQ)/2 - (MQ+MHQ)/2)",
63 "[(MQ+MHQ)/2 - HQ5)", 65 "[(MQ+MHQ)/2 - HQ5)",
64 "[HQ5 - \u221e)" 66 "[HQ5 - \u221e)"
65 }; 67 };
66 68
69 static {
70 // Active/deactivate facets.
71 FacetActivity.Registry.getInstance().register(
72 "fixanalysis",
73 new FacetActivity() {
74 @Override
75 public Boolean isInitialActive(
76 Artifact artifact,
77 Facet facet,
78 String output
79 ) {
80 String name = facet.getName();
81
82 if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT)
83 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS)
84 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ)
85 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT)
86 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS)
87 || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ)
88 ) {
89 return Boolean.FALSE;
90 }
91
92 return Boolean.TRUE;
93 }
94 });
95 }
96
67 /** 97 /**
68 * The default constructor that initializes an empty State object. 98 * The default constructor that initializes an empty State object.
69 */ 99 */
70 public FixAnalysisCompute() { 100 public FixAnalysisCompute() {
71 } 101 }

http://dive4elements.wald.intevation.org