Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java @ 4132:f6c73ee1b7f1
#543 Validate date range in client gauge time range selection state.
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 15 Oct 2012 09:29:25 +0200 |
| parents | 0de61fc9d281 |
| children |
comparison
equal
deleted
inserted
replaced
| 4115:0cc2c3d89a9d | 4132:f6c73ee1b7f1 |
|---|---|
| 26 import de.intevation.flys.client.shared.model.DoubleArrayData; | 26 import de.intevation.flys.client.shared.model.DoubleArrayData; |
| 27 import de.intevation.flys.client.shared.model.DoubleRangeData; | 27 import de.intevation.flys.client.shared.model.DoubleRangeData; |
| 28 import de.intevation.flys.client.shared.model.IntegerArrayData; | 28 import de.intevation.flys.client.shared.model.IntegerArrayData; |
| 29 import de.intevation.flys.client.shared.model.IntegerRangeData; | 29 import de.intevation.flys.client.shared.model.IntegerRangeData; |
| 30 import de.intevation.flys.client.shared.model.IntegerOptionsData; | 30 import de.intevation.flys.client.shared.model.IntegerOptionsData; |
| 31 import de.intevation.flys.client.shared.model.LongRangeData; | |
| 31 import de.intevation.flys.client.shared.model.OutputMode; | 32 import de.intevation.flys.client.shared.model.OutputMode; |
| 32 import de.intevation.flys.client.shared.model.Recommendation; | 33 import de.intevation.flys.client.shared.model.Recommendation; |
| 33 import de.intevation.flys.client.shared.model.WQDataItem; | 34 import de.intevation.flys.client.shared.model.WQDataItem; |
| 34 | 35 |
| 35 | 36 |
| 175 } | 176 } |
| 176 catch (NumberFormatException nfe) { | 177 catch (NumberFormatException nfe) { |
| 177 logger.warn("NumberFormatException: ", nfe); | 178 logger.warn("NumberFormatException: ", nfe); |
| 178 } | 179 } |
| 179 } | 180 } |
| 181 else if (type.equals("longrange")) { | |
| 182 String min = ClientProtocolUtils.getMinNode(d); | |
| 183 String max = ClientProtocolUtils.getMaxNode(d); | |
| 184 | |
| 185 String defMin = ClientProtocolUtils.getDefMin(d); | |
| 186 String defMax = ClientProtocolUtils.getDefMax(d); | |
| 187 | |
| 188 try { | |
| 189 long lower = Long.valueOf(min); | |
| 190 long upper = Long.valueOf(max); | |
| 191 | |
| 192 if (defMin != null && defMax != null) { | |
| 193 list.add(new LongRangeData( | |
| 194 name, label, | |
| 195 lower, upper, | |
| 196 Long.valueOf(defMin), | |
| 197 Long.valueOf(defMax))); | |
| 198 } | |
| 199 } | |
| 200 catch (NumberFormatException nfe) { | |
| 201 logger.warn("NumberFormatException: ", nfe); | |
| 202 } | |
| 203 } | |
| 180 else if (type.equals("intarray")) { | 204 else if (type.equals("intarray")) { |
| 181 list.add(new IntegerArrayData(name, label, null)); | 205 list.add(new IntegerArrayData(name, label, null)); |
| 182 } | 206 } |
| 183 else if (type.equals("intoptions") && uiProvider.equals("parameter-matrix")) { | 207 else if (type.equals("intoptions") && uiProvider.equals("parameter-matrix")) { |
| 184 list.add(DataFactory.createIntegerOptionsData(d, name, label)); | 208 list.add(DataFactory.createIntegerOptionsData(d, name, label)); |