comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 3233:7e5460d08eb0

WINFOArtifact: minor code improvement when lookup if facet should be initially active. flys-artifacts/trunk@4864 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 03 Jul 2012 13:21:11 +0000
parents ed07dd55f487
children 31168ac9c7e7
comparison
equal deleted inserted replaced
3232:cdbc457e23e2 3233:7e5460d08eb0
1 package de.intevation.flys.artifacts; 1 package de.intevation.flys.artifacts;
2 2
3 import de.intevation.artifactdatabase.data.StateData; 3 import de.intevation.artifactdatabase.data.StateData;
4 4
5 import de.intevation.artifacts.CallContext; 5 import de.intevation.artifacts.CallContext;
6
7 import de.intevation.artifacts.common.utils.StringUtils;
8
9 import de.intevation.flys.artifacts.geom.Lines;
6 10
7 import de.intevation.flys.artifacts.model.Calculation1; 11 import de.intevation.flys.artifacts.model.Calculation1;
8 import de.intevation.flys.artifacts.model.Calculation2; 12 import de.intevation.flys.artifacts.model.Calculation2;
9 import de.intevation.flys.artifacts.model.Calculation3; 13 import de.intevation.flys.artifacts.model.Calculation3;
10 import de.intevation.flys.artifacts.model.Calculation4; 14 import de.intevation.flys.artifacts.model.Calculation4;
22 import de.intevation.flys.artifacts.model.WstValueTable; 26 import de.intevation.flys.artifacts.model.WstValueTable;
23 import de.intevation.flys.artifacts.model.WstValueTableFactory; 27 import de.intevation.flys.artifacts.model.WstValueTableFactory;
24 28
25 import de.intevation.flys.artifacts.states.LocationDistanceSelect; 29 import de.intevation.flys.artifacts.states.LocationDistanceSelect;
26 30
27 import de.intevation.flys.artifacts.geom.Lines;
28
29 import de.intevation.flys.model.DischargeTable; 31 import de.intevation.flys.model.DischargeTable;
30 import de.intevation.flys.model.FastCrossSectionLine; 32 import de.intevation.flys.model.FastCrossSectionLine;
31 import de.intevation.flys.model.Gauge; 33 import de.intevation.flys.model.Gauge;
32 import de.intevation.flys.model.River; 34 import de.intevation.flys.model.River;
33 35
1163 * @param index index of the facet. 1165 * @param index index of the facet.
1164 * @return 0 if not active 1166 * @return 0 if not active
1165 */ 1167 */
1166 @Override 1168 @Override
1167 public int getInitialFacetActivity(String outputName, String facetName, int index) { 1169 public int getInitialFacetActivity(String outputName, String facetName, int index) {
1168 String [] inactives = new String[] {
1169 LONGITUDINAL_Q,
1170 DURATION_Q
1171 };
1172 1170
1173 logger.debug("WINFOArtifact.active?: " 1171 logger.debug("WINFOArtifact.active?: "
1174 + outputName 1172 + outputName
1175 + "/" 1173 + "/"
1176 + facetName); 1174 + facetName);
1179 facetName.equals(COMPUTED_DISCHARGE_MAINVALUES_W) 1177 facetName.equals(COMPUTED_DISCHARGE_MAINVALUES_W)
1180 && outputName.equals("computed_discharge_curve")) 1178 && outputName.equals("computed_discharge_curve"))
1181 { 1179 {
1182 return 0; 1180 return 0;
1183 } 1181 }
1184 return Arrays.asList(inactives).contains(facetName) 1182
1185 ? 0 1183 return StringUtils.contains(facetName, INACTIVES) ? 0 : 1;
1186 : 1; 1184 }
1187 } 1185
1188 1186 private static final String [] INACTIVES = new String[] {
1187 LONGITUDINAL_Q,
1188 DURATION_Q
1189 };
1189 1190
1190 /** 1191 /**
1191 * Returns the WstValueTable. 1192 * Returns the WstValueTable.
1192 */ 1193 */
1193 public WstValueTable getWstValueTable() { 1194 public WstValueTable getWstValueTable() {

http://dive4elements.wald.intevation.org