Skip to content

Commit 580af49

Browse files
turbanoffmrserb
turbanoff
authored and
mrserb
committed
8258006: Replaces while cycles with iterator with enhanced for in java.desktop
Reviewed-by: prr, serb
1 parent dc7f01f commit 580af49

25 files changed

+68
-167
lines changed

‎src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,11 +1252,10 @@ private void writeCommentExtension(GIFWritableImageMetadata im)
12521252
throws IOException {
12531253
if (im.comments != null) {
12541254
try {
1255-
Iterator<byte[]> iter = im.comments.iterator();
1256-
while (iter.hasNext()) {
1255+
for (byte[] bytes : im.comments) {
12571256
stream.write(0x21);
12581257
stream.write(0xfe);
1259-
writeBlocks(iter.next());
1258+
writeBlocks(bytes);
12601259
stream.write(0x00);
12611260
}
12621261
} catch (IOException e) {

‎src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -94,9 +94,7 @@ class DHTMarkerSegment extends MarkerSegment {
9494
protected Object clone() {
9595
DHTMarkerSegment newGuy = (DHTMarkerSegment) super.clone();
9696
newGuy.tables = new ArrayList<>(tables.size());
97-
Iterator<Htable> iter = tables.iterator();
98-
while (iter.hasNext()) {
99-
Htable table = iter.next();
97+
for (Htable table : tables) {
10098
newGuy.tables.add((Htable) table.clone());
10199
}
102100
return newGuy;

‎src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -87,9 +87,7 @@ class DQTMarkerSegment extends MarkerSegment {
8787
protected Object clone() {
8888
DQTMarkerSegment newGuy = (DQTMarkerSegment) super.clone();
8989
newGuy.tables = new ArrayList<>(tables.size());
90-
Iterator<Qtable> iter = tables.iterator();
91-
while (iter.hasNext()) {
92-
Qtable table = iter.next();
90+
for (Qtable table : tables) {
9391
newGuy.tables.add((Qtable) table.clone());
9492
}
9593
return newGuy;

‎src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,9 +1424,7 @@ private void checkAdobe(AdobeMarkerSegment adobe,
14241424
private JPEGQTable [] collectQTablesFromMetadata
14251425
(JPEGMetadata metadata) {
14261426
ArrayList<DQTMarkerSegment.Qtable> tables = new ArrayList<>();
1427-
Iterator<MarkerSegment> iter = metadata.markerSequence.iterator();
1428-
while (iter.hasNext()) {
1429-
MarkerSegment seg = iter.next();
1427+
for (MarkerSegment seg : metadata.markerSequence) {
14301428
if (seg instanceof DQTMarkerSegment) {
14311429
DQTMarkerSegment dqt =
14321430
(DQTMarkerSegment) seg;
@@ -1454,9 +1452,7 @@ private void checkAdobe(AdobeMarkerSegment adobe,
14541452
private JPEGHuffmanTable[] collectHTablesFromMetadata
14551453
(JPEGMetadata metadata, boolean wantDC) throws IIOException {
14561454
ArrayList<DHTMarkerSegment.Htable> tables = new ArrayList<>();
1457-
Iterator<MarkerSegment> iter = metadata.markerSequence.iterator();
1458-
while (iter.hasNext()) {
1459-
MarkerSegment seg = iter.next();
1455+
for (MarkerSegment seg : metadata.markerSequence) {
14601456
if (seg instanceof DHTMarkerSegment) {
14611457
DHTMarkerSegment dht = (DHTMarkerSegment) seg;
14621458
for (int i = 0; i < dht.tables.size(); i++) {

‎src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -635,9 +635,7 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
635635
* with the given tag, or null if none is found.
636636
*/
637637
MarkerSegment findMarkerSegment(int tag) {
638-
Iterator<MarkerSegment> iter = markerSequence.iterator();
639-
while (iter.hasNext()) {
640-
MarkerSegment seg = iter.next();
638+
for (MarkerSegment seg : markerSequence) {
641639
if (seg.tag == tag) {
642640
return seg;
643641
}
@@ -651,9 +649,7 @@ MarkerSegment findMarkerSegment(int tag) {
651649
*/
652650
MarkerSegment findMarkerSegment(Class<? extends MarkerSegment> cls, boolean first) {
653651
if (first) {
654-
Iterator<MarkerSegment> iter = markerSequence.iterator();
655-
while (iter.hasNext()) {
656-
MarkerSegment seg = iter.next();
652+
for (MarkerSegment seg : markerSequence) {
657653
if (cls.isInstance(seg)) {
658654
return seg;
659655
}
@@ -732,9 +728,7 @@ private List<MarkerSegment> cloneSequence() {
732728
return null;
733729
}
734730
List<MarkerSegment> retval = new ArrayList<>(markerSequence.size());
735-
Iterator<MarkerSegment> iter = markerSequence.iterator();
736-
while(iter.hasNext()) {
737-
MarkerSegment seg = iter.next();
731+
for (MarkerSegment seg : markerSequence) {
738732
retval.add((MarkerSegment) seg.clone());
739733
}
740734

@@ -955,9 +949,7 @@ protected IIOMetadataNode getStandardCompressionNode() {
955949

956950
// NumProgressiveScans - count sos segments
957951
int sosCount = 0;
958-
Iterator<MarkerSegment> iter = markerSequence.iterator();
959-
while (iter.hasNext()) {
960-
MarkerSegment ms = iter.next();
952+
for (MarkerSegment ms : markerSequence) {
961953
if (ms.tag == JPEG.SOS) {
962954
sosCount++;
963955
}
@@ -1022,9 +1014,7 @@ protected IIOMetadataNode getStandardTextNode() {
10221014
// Add a text entry for each COM Marker Segment
10231015
if (findMarkerSegment(JPEG.COM) != null) {
10241016
text = new IIOMetadataNode("Text");
1025-
Iterator<MarkerSegment> iter = markerSequence.iterator();
1026-
while (iter.hasNext()) {
1027-
MarkerSegment seg = iter.next();
1017+
for (MarkerSegment seg : markerSequence) {
10281018
if (seg.tag == JPEG.COM) {
10291019
COMMarkerSegment com = (COMMarkerSegment) seg;
10301020
IIOMetadataNode entry = new IIOMetadataNode("TextEntry");
@@ -1176,9 +1166,7 @@ private void mergeSequenceSubtree(Node sequenceTree)
11761166
private void mergeDQTNode(Node node) throws IIOInvalidTreeException {
11771167
// First collect any existing DQT nodes into a local list
11781168
ArrayList<DQTMarkerSegment> oldDQTs = new ArrayList<>();
1179-
Iterator<MarkerSegment> iter = markerSequence.iterator();
1180-
while (iter.hasNext()) {
1181-
MarkerSegment seg = iter.next();
1169+
for (MarkerSegment seg : markerSequence) {
11821170
if (seg instanceof DQTMarkerSegment) {
11831171
oldDQTs.add((DQTMarkerSegment) seg);
11841172
}
@@ -1251,9 +1239,7 @@ private void mergeDQTNode(Node node) throws IIOInvalidTreeException {
12511239
private void mergeDHTNode(Node node) throws IIOInvalidTreeException {
12521240
// First collect any existing DQT nodes into a local list
12531241
ArrayList<DHTMarkerSegment> oldDHTs = new ArrayList<>();
1254-
Iterator<MarkerSegment> iter = markerSequence.iterator();
1255-
while (iter.hasNext()) {
1256-
MarkerSegment seg = iter.next();
1242+
for (MarkerSegment seg : markerSequence) {
12571243
if (seg instanceof DHTMarkerSegment) {
12581244
oldDHTs.add((DHTMarkerSegment) seg);
12591245
}
@@ -2305,9 +2291,7 @@ private boolean isConsistent() {
23052291
*/
23062292
private int countScanBands() {
23072293
List<Integer> ids = new ArrayList<>();
2308-
Iterator<MarkerSegment> iter = markerSequence.iterator();
2309-
while(iter.hasNext()) {
2310-
MarkerSegment seg = iter.next();
2294+
for (MarkerSegment seg : markerSequence) {
23112295
if (seg instanceof SOSMarkerSegment) {
23122296
SOSMarkerSegment sos = (SOSMarkerSegment) seg;
23132297
SOSMarkerSegment.ScanComponentSpec [] specs = sos.componentSpecs;
@@ -2354,9 +2338,7 @@ void writeToStream(ImageOutputStream ios,
23542338
}
23552339
}
23562340
// Iterate over each MarkerSegment
2357-
Iterator<MarkerSegment> iter = markerSequence.iterator();
2358-
while(iter.hasNext()) {
2359-
MarkerSegment seg = iter.next();
2341+
for (MarkerSegment seg : markerSequence) {
23602342
if (seg instanceof JFIFMarkerSegment) {
23612343
if (ignoreJFIF == false) {
23622344
JFIFMarkerSegment jfif = (JFIFMarkerSegment) seg;

‎src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,7 @@ public static TIFFIFD getDirectoryAsIFD(TIFFDirectory dir) {
135135
}
136136

137137
public static TIFFTag getTag(int tagNumber, List<TIFFTagSet> tagSets) {
138-
Iterator<TIFFTagSet> iter = tagSets.iterator();
139-
while (iter.hasNext()) {
140-
TIFFTagSet tagSet = iter.next();
138+
for (TIFFTagSet tagSet : tagSets) {
141139
TIFFTag tag = tagSet.getTag(tagNumber);
142140
if (tag != null) {
143141
return tag;
@@ -148,9 +146,7 @@ public static TIFFTag getTag(int tagNumber, List<TIFFTagSet> tagSets) {
148146
}
149147

150148
public static TIFFTag getTag(String tagName, List<TIFFTagSet> tagSets) {
151-
Iterator<TIFFTagSet> iter = tagSets.iterator();
152-
while (iter.hasNext()) {
153-
TIFFTagSet tagSet = iter.next();
149+
for (TIFFTagSet tagSet : tagSets) {
154150
TIFFTag tag = tagSet.getTag(tagName);
155151
if (tag != null) {
156152
return tag;

‎src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -864,11 +864,7 @@ private void mergeStandardTree(Node root)
864864
int mapSize = maxIndex + 1;
865865
int paletteLength = 3*mapSize;
866866
char[] paletteEntries = new char[paletteLength];
867-
Iterator<Map.Entry<Integer,char[]>> paletteIter
868-
= palette.entrySet().iterator();
869-
while(paletteIter.hasNext()) {
870-
Map.Entry<Integer,char[]> paletteEntry
871-
= paletteIter.next();
867+
for (Map.Entry<Integer,char[]> paletteEntry : palette.entrySet()) {
872868
int index = paletteEntry.getKey();
873869
char[] rgb = paletteEntry.getValue();
874870
paletteEntries[index] =
@@ -1541,9 +1537,7 @@ public static TIFFIFD parseIFD(Node node) throws IIOInvalidTreeException {
15411537
int number = Integer.parseInt(getAttribute(node, "number"));
15421538

15431539
TIFFTagSet tagSet = null;
1544-
Iterator<TIFFTagSet> iter = tagSets.iterator();
1545-
while (iter.hasNext()) {
1546-
TIFFTagSet t = iter.next();
1540+
for (TIFFTagSet t : tagSets) {
15471541
if (t.getTag(number) != null) {
15481542
tagSet = t;
15491543
break;
@@ -1577,9 +1571,7 @@ private void mergeNativeTree(Node root) throws IIOInvalidTreeException {
15771571
TIFFIFD ifd = parseIFD(node);
15781572

15791573
List<TIFFTagSet> rootIFDTagSets = rootIFD.getTagSetList();
1580-
Iterator<TIFFTagSet> tagSetIter = ifd.getTagSetList().iterator();
1581-
while(tagSetIter.hasNext()) {
1582-
Object o = tagSetIter.next();
1574+
for (Object o : ifd.getTagSetList()) {
15831575
if(o instanceof TIFFTagSet && !rootIFDTagSets.contains(o)) {
15841576
rootIFD.addTagSet((TIFFTagSet)o);
15851577
}

‎src/java.desktop/share/classes/com/sun/media/sound/SF2Soundbank.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -458,9 +458,7 @@ private void readPdtaChunk(RIFFReader riff) throws IOException {
458458
}
459459
}
460460

461-
Iterator<SF2Layer> liter = this.layers.iterator();
462-
while (liter.hasNext()) {
463-
SF2Layer layer = liter.next();
461+
for (SF2Layer layer : this.layers) {
464462
Iterator<SF2LayerRegion> siter = layer.regions.iterator();
465463
SF2Region globalsplit = null;
466464
while (siter.hasNext()) {
@@ -487,9 +485,7 @@ private void readPdtaChunk(RIFFReader riff) throws IOException {
487485
}
488486

489487

490-
Iterator<SF2Instrument> iiter = this.instruments.iterator();
491-
while (iiter.hasNext()) {
492-
SF2Instrument instrument = iiter.next();
488+
for (SF2Instrument instrument : this.instruments) {
493489
Iterator<SF2InstrumentRegion> siter = instrument.regions.iterator();
494490
SF2Region globalsplit = null;
495491
while (siter.hasNext()) {

‎src/java.desktop/share/classes/java/awt/DefaultKeyboardFocusManager.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -971,9 +971,7 @@ void dumpMarkers() {
971971
focusLog.finest(">>> Markers dump, time: {0}", System.currentTimeMillis());
972972
synchronized (this) {
973973
if (typeAheadMarkers.size() != 0) {
974-
Iterator<TypeAheadMarker> iter = typeAheadMarkers.iterator();
975-
while (iter.hasNext()) {
976-
TypeAheadMarker marker = iter.next();
974+
for (TypeAheadMarker marker : typeAheadMarkers) {
977975
focusLog.finest(" {0}", marker);
978976
}
979977
}

‎src/java.desktop/share/classes/java/awt/Dialog.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,9 +1056,7 @@ public void show() {
10561056
// if this dialog is toolkit-modal, the filter should be added
10571057
// to all EDTs (for all AppContexts)
10581058
if (modalityType == ModalityType.TOOLKIT_MODAL) {
1059-
Iterator<AppContext> it = AppContext.getAppContexts().iterator();
1060-
while (it.hasNext()) {
1061-
AppContext appContext = it.next();
1059+
for (AppContext appContext : AppContext.getAppContexts()) {
10621060
if (appContext == showAppContext) {
10631061
continue;
10641062
}
@@ -1086,9 +1084,7 @@ public void show() {
10861084
// if this dialog is toolkit-modal, its filter must be removed
10871085
// from all EDTs (for all AppContexts)
10881086
if (modalityType == ModalityType.TOOLKIT_MODAL) {
1089-
Iterator<AppContext> it = AppContext.getAppContexts().iterator();
1090-
while (it.hasNext()) {
1091-
AppContext appContext = it.next();
1087+
for (AppContext appContext : AppContext.getAppContexts()) {
10921088
if (appContext == showAppContext) {
10931089
continue;
10941090
}

0 commit comments

Comments
 (0)