Skip to content

Commit 59d74a7

Browse files
committed
use for-each loop
1 parent 8ce6ca5 commit 59d74a7

File tree

59 files changed

+257
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+257
-322
lines changed

visualvm/application/src/org/graalvm/visualvm/application/type/MainClassApplicationTypeFactory.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ private static String descr(String key) {
143143

144144
protected MainClassApplicationTypeFactory() {
145145
map = new HashMap<>();
146-
for (int i = 0; i < appmatrix.length; i++) {
147-
String[] appDesc = appmatrix[i];
148-
146+
for (String[] appDesc : appmatrix) {
149147
map.put(appDesc[CLASS_NAME],appDesc);
150148
}
151149
}

visualvm/application/src/org/graalvm/visualvm/application/type/NetBeansApplicationType.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ public String getName() {
8080
* {@inheritDoc}
8181
*/
8282
public String getVersion() {
83-
Iterator<String> clIt = getClusters().iterator();
84-
while(clIt.hasNext()) {
85-
String cluster = clIt.next();
83+
for (String cluster : getClusters()) {
8684
if (cluster.startsWith(NB_CLUSTER)) {
8785
String ver = cluster.substring(NB_CLUSTER.length());
8886

visualvm/applicationviews/src/org/graalvm/visualvm/application/views/threads/ThreadMXBeanDataManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@ private void fillInThreadData() {
191191
}
192192
}
193193
// set remaining threads as terminated
194-
for (Iterator<Long> it = threadIdSet.iterator(); it.hasNext();) {
195-
Long elem = it.next();
194+
for (Long elem : threadIdSet) {
196195
tids[nThreads] = elem.intValue();
197196
states[nThreads] = CommonConstants.THREAD_STATUS_ZOMBIE;
198197
nThreads++;

visualvm/core/src/org/graalvm/visualvm/core/datasource/Storage.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,9 @@ public void clearCustomProperty(String key) {
194194
public synchronized void clearCustomProperties(String[] keys) {
195195
Properties prop = getCustomProperties(false);
196196
if (prop != null)
197-
for (int i = 0; i < keys.length; i++)
198-
prop.remove(keys[i]);
197+
for (String key : keys) {
198+
prop.remove(key);
199+
}
199200
storeCustomProperties(); // NOTE: this could be done lazily if storeCustomProperties() was public
200201
}
201202

visualvm/core/src/org/graalvm/visualvm/core/datasupport/Utils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,9 @@ public static boolean delete(File file, boolean deleteOnExit) {
326326

327327
if (file.isDirectory()) {
328328
File[] files = file.listFiles();
329-
for (int i = 0; i < files.length; i++) delete(files[i], deleteOnExit);
329+
for (File file1 : files) {
330+
delete(file1, deleteOnExit);
331+
}
330332
}
331333

332334
if (!file.delete()) {

visualvm/heapviewer.console/src/org/graalvm/visualvm/heapviewer/console/r/RQueries.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,7 @@ protected void fireActionPerformed(ActionEvent e) {
327327
SwingUtilities.invokeLater(new Runnable() {
328328
public void run() {
329329
List<Query> l = customQueries.list();
330-
Iterator<Query> i = l.iterator();
331-
while (i.hasNext()) {
332-
Query q = i.next();
330+
for (Query q : l) {
333331
if (sameQuery(query, q)) {
334332
Query qq = RQueryCustomizer.editCustomizer(query, ""); // NOI18N
335333
if (qq == null) return;

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaDiffDumpSelector.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ void populateSnapshotsList() {
180180
FileObject[] snapshotsOnDisk = listSavedHeapdumps(heapdumpDir);
181181
FileObject snapshotFile = (heapdumpFile != null) ? FileUtil.toFileObject(heapdumpFile) : null;
182182

183-
for (int i = 0; i < snapshotsOnDisk.length; i++) {
184-
if (((snapshotFile == null) || !snapshotsOnDisk[i].equals(snapshotFile))) {
185-
listModel.addElement(snapshotsOnDisk[i]);
183+
for (FileObject snapshotsOnDisk1 : snapshotsOnDisk) {
184+
if ((snapshotFile == null) || !snapshotsOnDisk1.equals(snapshotFile)) {
185+
listModel.addElement(snapshotsOnDisk1);
186186
}
187187
}
188188

@@ -634,10 +634,10 @@ static FileObject[] listSavedHeapdumps(File directory) {
634634

635635
ArrayList /*<FileObject>*/ files = new ArrayList /*<FileObject>*/();
636636

637-
for (int i = 0; i < children.length; i++) {
638-
FileObject child = children[i];
639-
if (checkHprofFile(FileUtil.toFile(children[i])))
637+
for (FileObject child : children) {
638+
if (checkHprofFile(FileUtil.toFile(child))) {
640639
files.add(child);
640+
}
641641
}
642642

643643
Collections.sort(files,

visualvm/host/src/org/graalvm/visualvm/host/impl/HostProvider.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,7 @@ public void run() {
164164
Set<Host> remoteHostsSet = remoteHosts.getDataSources(Host.class);
165165
if (!createOnly && remoteHostsSet.contains(newHost)) {
166166
storage.deleteCustomPropertiesStorage();
167-
Iterator<Host> existingHosts = remoteHostsSet.iterator();
168-
while (existingHosts.hasNext()) {
169-
Host existingHost = existingHosts.next();
167+
for (Host existingHost : remoteHostsSet) {
170168
if (existingHost.equals(newHost)) {
171169
newHost = existingHost;
172170
break;

visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/PaintersModel.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ public void addPainters(ChartItem[] addedItems, ItemPainter[] addedPainters) {
105105
}
106106

107107
public void removePainters(ChartItem[] removedItems) {
108-
for (int i = 0; i < removedItems.length; i++)
109-
painters.remove(removedItems[i]);
108+
for (ChartItem removedItem : removedItems) {
109+
painters.remove(removedItem);
110+
}
110111
}
111112

112113

visualvm/libs.profiler/lib.profiler.charts/src/org/graalvm/visualvm/lib/charts/xy/synchronous/SynchronousXYItemsModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public SynchronousXYItemsModel(Timeline timeline, SynchronousXYItem[] items) {
6464
// --- Public interface ----------------------------------------------------
6565

6666
public void addItems(SynchronousXYItem[] addedItems) {
67-
for (int i = 0; i < addedItems.length; i++) {
68-
addedItems[i].setTimeline(timeline);
69-
items.add(addedItems[i]);
67+
for (SynchronousXYItem addedItem : addedItems) {
68+
addedItem.setTimeline(timeline);
69+
items.add(addedItem);
7070
}
7171

7272
fireItemsAdded(Arrays.asList((ChartItem[])addedItems));

0 commit comments

Comments
 (0)