Skip to content

Commit df18a45

Browse files
author
peer
committed
replacet iterator-for-loops by foreach-loops for xmltree
1 parent 2cca633 commit df18a45

File tree

8 files changed

+55
-29
lines changed

8 files changed

+55
-29
lines changed

‎sudoq-model/src/de/sudoq/model/game/Game.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,7 @@ public void fillFromXml(XmlTree xmlTreeRepresentation) {
516516

517517
this.assistancesCost = Integer.parseInt(xmlTreeRepresentation.getAttributeValue("assistancesCost"));
518518

519-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
520-
XmlTree sub = iterator.next();
519+
for (XmlTree sub : xmlTreeRepresentation) {
521520
if (sub.getName().equals("sudoku")) {
522521
sudoku = SudokuManager.getEmptySudokuToFillWithXml();
523522
sudoku.fillFromXml(sub);
@@ -528,8 +527,7 @@ public void fillFromXml(XmlTree xmlTreeRepresentation) {
528527
}
529528
stateHandler = new GameStateHandler();
530529

531-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
532-
XmlTree sub = iterator.next();
530+
for (XmlTree sub : xmlTreeRepresentation) {
533531
if (sub.getName().equals("action")) {
534532
int diff = Integer.parseInt(sub.getAttributeValue(ActionTreeElement.DIFF));
535533

‎sudoq-model/src/de/sudoq/model/profile/Profile.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -427,17 +427,12 @@ public void fillFromXml(XmlTree xmlTreeRepresentation) {
427427
setCurrentGame(Integer.parseInt(xmlTreeRepresentation.getAttributeValue("currentGame")));
428428
setName(xmlTreeRepresentation.getAttributeValue("name"));
429429

430-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
431-
XmlTree sub = iterator.next();
432-
if(sub.getName().equals("gameSettings")){
430+
for(XmlTree sub: xmlTreeRepresentation){
431+
if(sub.getName().equals("gameSettings")){
433432
gameSettings = new GameSettings();
434433
gameSettings.fillFromXml(sub);
435434
}
436-
}
437-
/*TODO try this
438-
for(XmlTree xt: xmlTreeRepresentation){
439-
440-
}*/
435+
}
441436

442437
this.statistics = new int[Statistics.values().length];
443438
for (Statistics stat : Statistics.values()) {

‎sudoq-model/src/de/sudoq/model/sudoku/Constraint.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ public void fillFromXml(XmlTree xmlTreeRepresentation)
216216
this.name = xmlTreeRepresentation.getAttributeValue("name");
217217
this.type = ConstraintType.values()[Integer.parseInt(xmlTreeRepresentation.getAttributeValue("type"))];
218218

219-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
220-
XmlTree sub = iterator.next();
219+
for (XmlTree sub : xmlTreeRepresentation) {
221220
if (sub.getName().equals("position")) {
222221
addPosition(Position.fillFromXmlStatic(sub));
223222
}

‎sudoq-model/src/de/sudoq/model/sudoku/Sudoku.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,11 @@ public void fillFromXml(XmlTree xmlTreeRepresentation) {
311311
complexity = compl == null ? null : Complexity.values()[Integer.parseInt(compl)];
312312

313313
// build the fields
314-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
315-
XmlTree sub = iterator.next();
314+
for (XmlTree sub : xmlTreeRepresentation) {
316315
if (sub.getName().equals("fieldmap")) {
317-
int fieldId = Integer.parseInt(sub.getAttributeValue("id"));
316+
int fieldId = Integer.parseInt( sub.getAttributeValue("id"));
318317
boolean editable = Boolean.parseBoolean(sub.getAttributeValue("editable"));
319-
int solution = Integer.parseInt(sub.getAttributeValue("solution"));
318+
int solution = Integer.parseInt( sub.getAttributeValue("solution"));
320319
int x = -1, y = -1;
321320
// check if there is only one child element
322321
if (sub.getNumberOfChildren() != 1) {

‎sudoq-model/src/de/sudoq/model/sudoku/sudokuTypes/ComplexityConstraintBuilder.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ComplexityConstraint getComplexityConstraint(Complexity complexity){
3030
}
3131

3232

33-
public final String TITLE = "ComplexityConstraintBuilder";
33+
public static final String TITLE = "ComplexityConstraintBuilder";
3434

3535
@Override
3636
public XmlTree toXmlTree() {
@@ -44,8 +44,7 @@ public XmlTree toXmlTree() {
4444
@Override
4545
public void fillFromXml(XmlTree xmlTreeRepresentation) throws IllegalArgumentException {
4646
specimen = new HashMap<Complexity, ComplexityConstraint>();
47-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
48-
XmlTree sub = iterator.next();
47+
for (XmlTree sub : xmlTreeRepresentation) {
4948
ComplexityConstraint cc = new ComplexityConstraint();
5049
cc.fillFromXml(sub);
5150
specimen.put(cc.getComplexity(), cc);

‎sudoq-model/src/de/sudoq/model/sudoku/sudokuTypes/SetOfPermutationProperties.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ public XmlTree toXmlTree() {
3737

3838
@Override
3939
public void fillFromXml(XmlTree xmlTreeRepresentation) throws IllegalArgumentException {
40-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
41-
XmlTree sub = iterator.next();
40+
for (XmlTree sub : xmlTreeRepresentation) {
4241
if (sub.getName().equals(PERMUTATION_PROPERTY)) {
4342
add(PermutationProperties.values()[Integer.parseInt(sub.getAttributeValue(TAG_PROPERTY_NR))]);
4443
}

‎sudoq-model/src/de/sudoq/model/sudoku/sudokuTypes/SudokuType.java‎

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,46 @@ public void fillFromXml(XmlTree xmlTreeRepresentation) throws IllegalArgumentExc
313313
typeName = SudokuTypes.values()[Integer.parseInt(xmlTreeRepresentation.getAttributeValue("typename"))];
314314
numberOfSymbols = Integer.parseInt(xmlTreeRepresentation.getAttributeValue("numberOfSymbols"));
315315
standardAllocationFactor = Float.parseFloat(xmlTreeRepresentation.getAttributeValue("standardAllocationFactor"));
316-
for (Iterator<XmlTree> iterator = xmlTreeRepresentation.getChildren(); iterator.hasNext();) {
317-
XmlTree sub = iterator.next();
316+
for (XmlTree sub : xmlTreeRepresentation) {
317+
switch (sub.getName()) {
318+
case "size":
319+
dimensions = Position.fillFromXmlStatic(sub);
320+
break;
321+
322+
case "blockSize":
323+
blockSize = Position.fillFromXmlStatic(sub);
324+
break;
325+
326+
case "constraint":
327+
Constraint c = new Constraint(new UniqueConstraintBehavior(), ConstraintType.LINE);
328+
c.fillFromXml(sub);
329+
constraints.add(c);
330+
break;
331+
332+
case SetOfPermutationProperties.SET_OF_PERMUTATION_PROPERTIES:
333+
setOfPermutationProperties = new SetOfPermutationProperties();
334+
((SetOfPermutationProperties) setOfPermutationProperties).fillFromXml(sub); //cast neccessary because setOPP is defined as
335+
break;
336+
337+
case "helperList":
338+
helperList = new ArrayList<Helpers>(sub.getNumberOfAttributes());
339+
for(Iterator<XmlAttribute> jterator = sub.getAttributes(); jterator.hasNext();){
340+
XmlAttribute xa = jterator.next();
341+
int index = Integer.parseInt(xa.getName());
342+
Helpers h = Helpers.values()[Integer.parseInt(xa.getValue())];
343+
helperList.set(index, h);
344+
}
345+
break;
346+
347+
case ComplexityConstraintBuilder.TITLE:
348+
ccb = new ComplexityConstraintBuilder();
349+
ccb.fillFromXml(sub);
350+
break;
351+
352+
default:
353+
break;
354+
}
355+
/*
318356
if (sub.getName().equals("size")) {
319357
dimensions = Position.fillFromXmlStatic(sub);
320358
} else if (sub.getName().equals("blockSize")){
@@ -338,7 +376,7 @@ public void fillFromXml(XmlTree xmlTreeRepresentation) throws IllegalArgumentExc
338376
} else if (sub.getName().equals(ccb.TITLE)){
339377
ccb = new ComplexityConstraintBuilder();
340378
ccb.fillFromXml(sub);
341-
}
379+
}*/
342380
}
343381
}
344382
}

‎sudoq-model/src/de/sudoq/model/xml/XmlHelper.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,8 @@ public String buildXmlStructure(XmlTree tree) throws IllegalArgumentException {
209209
} else {
210210
sb.append(">\n");
211211
// write the subtree elements
212-
for (Iterator<XmlTree> i = tree.getChildren(); i.hasNext();) {
213-
XmlTree subtree = i.next();
214-
sb.append(buildXmlStructure(subtree));
212+
for (XmlTree sub : tree) {
213+
sb.append(buildXmlStructure(sub));
215214
}
216215
}
217216
// close the tag again

0 commit comments

Comments
 (0)