Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/ArtifactDescriptionFactory.java @ 1566:c408074c6409
Initialize the min and max fields in RangePanel.
flys-client/trunk@3822 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Mon, 30 Jan 2012 10:12:05 +0000 |
parents | 252c22237fe7 |
children | 1227878665b5 |
comparison
equal
deleted
inserted
replaced
1565:87f5ed6960e8 | 1566:c408074c6409 |
---|---|
142 DataItem def = extractDefaultDataItem(d); | 142 DataItem def = extractDefaultDataItem(d); |
143 | 143 |
144 list.add(new DefaultData(name, label, null, dataItems, def)); | 144 list.add(new DefaultData(name, label, null, dataItems, def)); |
145 } | 145 } |
146 else if (type.equals("intrange")) { | 146 else if (type.equals("intrange")) { |
147 String min = ClientProtocolUtils.getMinNode(d); | 147 String min = ClientProtocolUtils.getMinNode(d); |
148 String max = ClientProtocolUtils.getMaxNode(d); | 148 String max = ClientProtocolUtils.getMaxNode(d); |
149 | |
150 String defMin = ClientProtocolUtils.getDefMin(d); | |
151 String defMax = ClientProtocolUtils.getDefMax(d); | |
149 | 152 |
150 try { | 153 try { |
151 int lower = Integer.parseInt(min); | 154 int lower = Integer.parseInt(min); |
152 int upper = Integer.parseInt(max); | 155 int upper = Integer.parseInt(max); |
153 list.add(new IntegerRangeData(name, label, lower, upper)); | 156 |
157 if (defMin != null && defMax != null) { | |
158 list.add(new IntegerRangeData( | |
159 name, label, | |
160 lower, upper, | |
161 Integer.parseInt(defMin), | |
162 Integer.parseInt(defMax))); | |
163 } | |
164 else { | |
165 list.add( | |
166 new IntegerRangeData(name, label, lower, upper)); | |
167 } | |
154 } | 168 } |
155 catch (NumberFormatException nfe) { | 169 catch (NumberFormatException nfe) { |
156 logger.warn("NumberFormatException: ", nfe); | 170 logger.warn("NumberFormatException: ", nfe); |
157 } | 171 } |
158 } | 172 } |