Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/themes/DefaultTheme.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 | 6566c7868456 |
| children | 8e66293c5369 |
comparison
equal
deleted
inserted
replaced
| 3731:e32b822f3cfa | 3732:fe29b0226faf |
|---|---|
| 1 package de.intevation.flys.themes; | 1 package de.intevation.flys.themes; |
| 2 | 2 |
| 3 import java.util.HashMap; | 3 import java.util.HashMap; |
| 4 import java.util.Iterator; | |
| 5 import java.util.Map; | 4 import java.util.Map; |
| 6 | 5 |
| 7 import org.w3c.dom.Document; | 6 import org.w3c.dom.Document; |
| 8 import org.w3c.dom.Element; | 7 import org.w3c.dom.Element; |
| 9 import org.w3c.dom.Node; | 8 import org.w3c.dom.Node; |
| 152 * | 151 * |
| 153 * @param cr The ElementCreator. | 152 * @param cr The ElementCreator. |
| 154 * @param theme The document root element. | 153 * @param theme The document root element. |
| 155 */ | 154 */ |
| 156 protected void appendAttributes(ElementCreator cr, Element theme) { | 155 protected void appendAttributes(ElementCreator cr, Element theme) { |
| 157 Iterator<String> iter = attr.keySet().iterator(); | |
| 158 | 156 |
| 159 while (iter.hasNext()) { | 157 for (Map.Entry<String, String> entry: attr.entrySet()) { |
| 160 String key = iter.next(); | 158 String key = entry.getKey(); |
| 161 String val = getAttribute(key); | 159 String val = entry.getValue(); |
| 162 | 160 |
| 163 if (key == null || val == null) { | 161 if (key != null && val != null) { |
| 164 continue; | 162 cr.addAttr(theme, key, val); |
| 165 } | 163 } |
| 166 | |
| 167 cr.addAttr(theme, key, val); | |
| 168 } | 164 } |
| 169 } | 165 } |
| 170 | 166 |
| 171 | 167 |
| 172 /** | 168 /** |
| 174 * | 170 * |
| 175 * @param cr The ElementCreator. | 171 * @param cr The ElementCreator. |
| 176 * @param theme The document root element. | 172 * @param theme The document root element. |
| 177 */ | 173 */ |
| 178 protected void appendFields(ElementCreator cr, Element theme) { | 174 protected void appendFields(ElementCreator cr, Element theme) { |
| 179 Iterator<String> iter = fields.keySet().iterator(); | |
| 180 | 175 |
| 181 while (iter.hasNext()) { | 176 for (Map.Entry<String, ThemeField> entry: fields.entrySet()) { |
| 182 String name = iter.next(); | 177 String name = entry.getKey(); |
| 183 | 178 ThemeField field = entry.getValue(); |
| 184 ThemeField field = getField(name); | |
| 185 | 179 |
| 186 Document doc = field.toXML(); | 180 Document doc = field.toXML(); |
| 187 Node root = doc.getFirstChild(); | 181 Node root = doc.getFirstChild(); |
| 188 | 182 |
| 189 theme.appendChild(theme.getOwnerDocument().importNode(root, true)); | 183 theme.appendChild(theme.getOwnerDocument().importNode(root, true)); |