Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java @ 3732:fe29b0226faf
More iterator code simplification.
flys-artifacts/trunk@5405 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sat, 08 Sep 2012 15:58:08 +0000 |
| parents | 1bb6fb621167 |
| children | 59beb6651ee6 |
comparison
equal
deleted
inserted
replaced
| 3731:e32b822f3cfa | 3732:fe29b0226faf |
|---|---|
| 1 package de.intevation.flys.artifacts.states; | 1 package de.intevation.flys.artifacts.states; |
| 2 | 2 |
| 3 import java.text.NumberFormat; | 3 import java.text.NumberFormat; |
| 4 import java.util.Iterator; | |
| 5 import java.util.Locale; | 4 import java.util.Locale; |
| 6 import java.util.Map; | 5 import java.util.Map; |
| 7 import java.util.List; | 6 import java.util.List; |
| 8 | 7 |
| 9 import org.apache.log4j.Logger; | 8 import org.apache.log4j.Logger; |
| 85 Map<String, StateData> theData = getData(); | 84 Map<String, StateData> theData = getData(); |
| 86 if (theData == null) { | 85 if (theData == null) { |
| 87 return ui; | 86 return ui; |
| 88 } | 87 } |
| 89 | 88 |
| 90 Iterator<String> iter = theData.keySet().iterator(); | 89 FLYSArtifact flys = (FLYSArtifact)artifact; |
| 91 FLYSArtifact flys = (FLYSArtifact) artifact; | 90 |
| 92 | 91 for (String name: theData.keySet()) { |
| 93 while (iter.hasNext()) { | |
| 94 String name = iter.next(); | |
| 95 appendStaticData(flys, context, creator, ui, name); | 92 appendStaticData(flys, context, creator, ui, name); |
| 96 } | 93 } |
| 97 | 94 |
| 98 return ui; | 95 return ui; |
| 99 } | 96 } |
| 113 return; | 110 return; |
| 114 } | 111 } |
| 115 | 112 |
| 116 String type = data.getType(); | 113 String type = data.getType(); |
| 117 | 114 |
| 118 logger.debug( | 115 if (logger.isDebugEnabled()) { |
| 119 "Append element " + type + "'" + | 116 logger.debug( |
| 120 name + "' (" + value + ")"); | 117 "Append element " + type + "'" + |
| 118 name + "' (" + value + ")"); | |
| 119 } | |
| 121 | 120 |
| 122 Element e = createStaticData(flys, cr, context, name, value, type); | 121 Element e = createStaticData(flys, cr, context, name, value, type); |
| 123 | 122 |
| 124 ui.appendChild(e); | 123 ui.appendChild(e); |
| 125 | 124 |
| 181 CallMeta meta = cc.getMeta(); | 180 CallMeta meta = cc.getMeta(); |
| 182 | 181 |
| 183 try { | 182 try { |
| 184 // XXX A better way to format the output would be to use the | 183 // XXX A better way to format the output would be to use the |
| 185 // 'type' value of the data objects. | 184 // 'type' value of the data objects. |
| 186 double doubleVal = Double.valueOf(value); | 185 double doubleVal = Double.parseDouble(value); |
| 187 Locale l = Resources.getLocale(meta); | 186 Locale l = Resources.getLocale(meta); |
| 188 NumberFormat nf = NumberFormat.getInstance(l); | 187 NumberFormat nf = NumberFormat.getInstance(l); |
| 189 | 188 |
| 190 return nf.format(doubleVal); | 189 return nf.format(doubleVal); |
| 191 } | 190 } |
| 257 Map<String, StateData> theData = getData(); | 256 Map<String, StateData> theData = getData(); |
| 258 if (theData == null) { | 257 if (theData == null) { |
| 259 return ui; | 258 return ui; |
| 260 } | 259 } |
| 261 | 260 |
| 262 Iterator<String> iter = theData.keySet().iterator(); | 261 FLYSArtifact flys = (FLYSArtifact)artifact; |
| 263 FLYSArtifact flys = (FLYSArtifact) artifact; | 262 |
| 264 | 263 for (String name: theData.keySet()) { |
| 265 while (iter.hasNext()) { | |
| 266 String name = iter.next(); | |
| 267 StateData data = getData(flys, name); | 264 StateData data = getData(flys, name); |
| 268 | 265 |
| 269 data = data != null ? data : getData(name); | 266 if (data == null) { |
| 267 data = getData(name); | |
| 268 } | |
| 270 | 269 |
| 271 Element select = createData(creator, artifact, data, context); | 270 Element select = createData(creator, artifact, data, context); |
| 272 | 271 |
| 273 String[] defaults = getDefaultsFor(context, data); | 272 String[] defaults = getDefaultsFor(context, data); |
| 274 if (defaults != null && defaults.length > 1) { | 273 if (defaults != null && defaults.length > 1) { |
| 405 CallContext cc, | 404 CallContext cc, |
| 406 StateData stateData, | 405 StateData stateData, |
| 407 String name, | 406 String name, |
| 408 String val | 407 String val |
| 409 ) { | 408 ) { |
| 410 logger.debug("Transform data ('" + name + "','" + val + "')"); | 409 if (logger.isDebugEnabled()) { |
| 410 logger.debug("Transform data ('" + name + "','" + val + "')"); | |
| 411 } | |
| 411 | 412 |
| 412 stateData.setValue(val); | 413 stateData.setValue(val); |
| 413 | 414 |
| 414 return stateData; | 415 return stateData; |
| 415 } | 416 } |