Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixAnalysisCompute.java @ 8856:5e38e2924c07 3.2.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix code style.
author Tom Gottfried <tom@intevation.de>
date Thu, 18 Jan 2018 20:12:01 +0100
parents 3e93f29281bc
children 42c15e2f95fb 0a5239a1e46e
comparison
equal deleted inserted replaced
8855:d7c005e12af0 8856:5e38e2924c07
54 implements FacetTypes 54 implements FacetTypes
55 { 55 {
56 /** The log used in this class. */ 56 /** The log used in this class. */
57 private static Logger log = Logger.getLogger(FixAnalysisCompute.class); 57 private static Logger log = Logger.getLogger(FixAnalysisCompute.class);
58 58
59 private static final String I18N_REFERENCEPERIOD_SHORT = "fix.reference.period.event.short"; 59 private static final String I18N_REFERENCEPERIOD_SHORT =
60 "fix.reference.period.event.short";
60 61
61 private static final String I18N_ANALYSISPERIODS = "fix.analysis.periods"; 62 private static final String I18N_ANALYSISPERIODS = "fix.analysis.periods";
62 63
63 private static final String I18N_DERIVATIVE = "fix.derivative"; 64 private static final String I18N_DERIVATIVE = "fix.derivative";
64 65
66 67
67 private static final String I18N_ANALYSIS = "fix.analysis.short"; 68 private static final String I18N_ANALYSIS = "fix.analysis.short";
68 69
69 private static final String I18N_DEVIATION = "fix.deviation"; 70 private static final String I18N_DEVIATION = "fix.deviation";
70 71
71 private static final String I18N_REFERENCEDEVIATION = "fix.reference.deviation"; 72 private static final String I18N_REFERENCEDEVIATION =
72 73 "fix.reference.deviation";
73 private static final String I18N_REFERENCEPERIOD = "state.fix.analysis.referenceperiod"; 74
75 private static final String I18N_REFERENCEPERIOD =
76 "state.fix.analysis.referenceperiod";
74 77
75 public static final String [] SECTOR_LABELS = { 78 public static final String [] SECTOR_LABELS = {
76 "fix.mnq", 79 "fix.mnq",
77 "fix.mq", 80 "fix.mq",
78 "fix.mhq", 81 "fix.mhq",
88 public Boolean isInitialActive( 91 public Boolean isInitialActive(
89 Artifact artifact, 92 Artifact artifact,
90 Facet facet, 93 Facet facet,
91 String output 94 String output
92 ) { 95 ) {
93 if (output.contains(FacetTypes.ChartType.FLSC.toString())) { 96 if (
97 output.contains(FacetTypes.ChartType.FLSC.toString())
98 ) {
94 // Longitudinal section chart 99 // Longitudinal section chart
95 String name = facet.getName(); 100 String name = facet.getName();
96 101
97 if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT) 102 if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT)
98 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS) 103 || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS)
103 ) { 108 ) {
104 return Boolean.FALSE; 109 return Boolean.FALSE;
105 } 110 }
106 } 111 }
107 if (output.contains(FacetTypes.ChartType.FDWC.toString()) 112 if (output.contains(FacetTypes.ChartType.FDWC.toString())
108 && facet.getName().contains(FacetTypes.FIX_SECTOR_AVERAGE_DWT)) { 113 && facet.getName().contains(
114 FacetTypes.FIX_SECTOR_AVERAGE_DWT)) {
109 return Boolean.FALSE; 115 return Boolean.FALSE;
110 } 116 }
111 117
112 return Boolean.TRUE; 118 return Boolean.TRUE;
113 } 119 }
170 int sectorMask = fr.getUsedSectorsInAnalysisPeriods(); 176 int sectorMask = fr.getUsedSectorsInAnalysisPeriods();
171 177
172 int qsS = access.getQSectorStart(); 178 int qsS = access.getQSectorStart();
173 int qsE = access.getQSectorEnd(); 179 int qsE = access.getQSectorEnd();
174 180
175 DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy"); 181 DateFormat df = Formatter.getDateFormatter(
176 DateFormat lf = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy'T'HH:mm"); 182 context.getMeta(), "dd.MM.yyyy");
183 DateFormat lf = Formatter.getDateFormatter(
184 context.getMeta(), "dd.MM.yyyy'T'HH:mm");
177 185
178 DateRange [] periods = access.getAnalysisPeriods(); 186 DateRange [] periods = access.getAnalysisPeriods();
179 187
180 for (int i = 0; i < periods.length; i++) { 188 for (int i = 0; i < periods.length; i++) {
181 DateRange period = periods[i]; 189 DateRange period = periods[i];
http://dive4elements.wald.intevation.org