From 6e03645ad80adf71527ca18f937db4b8e34b7f13 Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Sat, 6 Apr 2019 19:16:36 +0200 Subject: Use jdk 5 for loop Replace simple uses of Iterator with a corresponding for-loop. Also add missing braces on loops as necessary. Change-Id: I708d82acdf194787e3353699c07244c5ac3de189 Signed-off-by: Carsten Hammer Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/api/SubmoduleDeinitCommand.java | 4 ++-- .../jgit/internal/storage/dfs/DeltaBaseCache.java | 4 ++-- .../jgit/internal/storage/file/RefDirectory.java | 6 ++++-- .../org/eclipse/jgit/patch/CombinedHunkHeader.java | 13 +++++++------ .../eclipse/jgit/revplot/AbstractPlotRenderer.java | 20 ++++++++++---------- .../eclipse/jgit/treewalk/NameConflictTreeWalk.java | 6 ++---- .../src/org/eclipse/jgit/treewalk/TreeWalk.java | 12 ++++-------- 7 files changed, 31 insertions(+), 34 deletions(-) (limited to 'org.eclipse.jgit') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleDeinitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleDeinitCommand.java index 5a0528b0f5..ebcea4b1dd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleDeinitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleDeinitCommand.java @@ -173,8 +173,8 @@ public class SubmoduleDeinitCommand } final File[] ls = dir.listFiles(); if (ls != null) { - for (int i = 0; i < ls.length; i++) { - FileUtils.delete(ls[i], RECURSIVE); + for (File f : ls) { + FileUtils.delete(f, RECURSIVE); } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DeltaBaseCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DeltaBaseCache.java index bd4b4d23f4..3b92deeaeb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DeltaBaseCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DeltaBaseCache.java @@ -180,8 +180,8 @@ final class DeltaBaseCache { int getMemoryUsedByTableForTest() { int r = 0; - for (int i = 0; i < table.length; i++) { - for (Entry e = table[i]; e != null; e = e.tableNext) { + for (Entry t : table) { + for (Entry e = t; e != null; e = e.tableNext) { r += e.data.length; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index a4729bba48..35aca086bf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -1128,9 +1128,11 @@ public class RefDirectory extends RefDatabase { // check whether the found new ref is the an additional ref. These refs // should not go into looseRefs - for (int i = 0; i < additionalRefsNames.length; i++) - if (name.equals(additionalRefsNames[i])) + for (String additionalRefsName : additionalRefsNames) { + if (name.equals(additionalRefsName)) { return n; + } + } if (looseRefs.compareAndSet(curList, curList.add(idx, n))) modCnt.incrementAndGet(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java index d278132c61..74eec81209 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/CombinedHunkHeader.java @@ -109,12 +109,13 @@ public class CombinedHunkHeader extends HunkHeader { final MutableInteger ptr = new MutableInteger(); ptr.value = nextLF(buf, startOffset, ' '); - for (int n = 0; n < old.length; n++) { - old[n].startLine = -parseBase10(buf, ptr.value, ptr); - if (buf[ptr.value] == ',') - old[n].lineCount = parseBase10(buf, ptr.value + 1, ptr); - else - old[n].lineCount = 1; + for (CombinedOldImage o : old) { + o.startLine = -parseBase10(buf, ptr.value, ptr); + if (buf[ptr.value] == ',') { + o.lineCount = parseBase10(buf, ptr.value + 1, ptr); + } else { + o.lineCount = 1; + } } newStartLine = parseBase10(buf, ptr.value + 1, ptr); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java index 58e2106fe2..b2f8d11921 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/AbstractPlotRenderer.java @@ -114,39 +114,39 @@ public abstract class AbstractPlotRenderer { drawLine(myColor, myLaneX, h, myLaneX, (h + dotSize) / 2, LINE_WIDTH); - for (int i = 0; i < commit.mergingLanes.length; i++) { - final TLane pLane = (TLane) commit.mergingLanes[i]; + for (PlotLane mergingLane : commit.mergingLanes) { + final TLane pLane = (TLane) mergingLane; final TColor pColor = laneColor(pLane); final int cx = laneC(pLane); - if (Math.abs(myLaneX - cx) > LANE_WIDTH) { final int ix; - if (myLaneX < cx) + if (myLaneX < cx) { ix = cx - LANE_WIDTH / 2; - else + } else { ix = cx + LANE_WIDTH / 2; + } drawLine(pColor, myLaneX, h / 2, ix, h / 2, LINE_WIDTH); drawLine(pColor, ix, h / 2, cx, h, LINE_WIDTH); } else drawLine(pColor, myLaneX, h / 2, cx, h, LINE_WIDTH); - maxCenter = Math.max(maxCenter, cx); } } if (commit.getChildCount() > 0) { - for (int i = 0; i < commit.forkingOffLanes.length; i++) { - final TLane childLane = (TLane) commit.forkingOffLanes[i]; + for (PlotLane forkingOffLane : commit.forkingOffLanes) { + final TLane childLane = (TLane) forkingOffLane; final TColor cColor = laneColor(childLane); final int cx = laneC(childLane); if (Math.abs(myLaneX - cx) > LANE_WIDTH) { final int ix; - if (myLaneX < cx) + if (myLaneX < cx) { ix = cx - LANE_WIDTH / 2; - else + } else { ix = cx + LANE_WIDTH / 2; + } drawLine(cColor, myLaneX, h / 2, ix, h / 2, LINE_WIDTH); drawLine(cColor, ix, h / 2, cx, 0, LINE_WIDTH); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java index 61b130f93f..2f8af78f82 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java @@ -323,8 +323,7 @@ public class NameConflictTreeWalk extends TreeWalk { @Override void popEntriesEqual() throws CorruptObjectException { final AbstractTreeIterator ch = currentHead; - for (int i = 0; i < trees.length; i++) { - final AbstractTreeIterator t = trees[i]; + for (AbstractTreeIterator t : trees) { if (t.matches == ch) { if (t.matchShift == 0) t.next(1); @@ -343,8 +342,7 @@ public class NameConflictTreeWalk extends TreeWalk { @Override void skipEntriesEqual() throws CorruptObjectException { final AbstractTreeIterator ch = currentHead; - for (int i = 0; i < trees.length; i++) { - final AbstractTreeIterator t = trees[i]; + for (AbstractTreeIterator t : trees) { if (t.matches == ch) { if (t.matchShift == 0) t.skip(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java index 69303d6ee3..65d8512179 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java @@ -1338,8 +1338,7 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { void popEntriesEqual() throws CorruptObjectException { final AbstractTreeIterator ch = currentHead; - for (int i = 0; i < trees.length; i++) { - final AbstractTreeIterator t = trees[i]; + for (AbstractTreeIterator t : trees) { if (t.matches == ch) { t.next(1); t.matches = null; @@ -1349,8 +1348,7 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { void skipEntriesEqual() throws CorruptObjectException { final AbstractTreeIterator ch = currentHead; - for (int i = 0; i < trees.length; i++) { - final AbstractTreeIterator t = trees[i]; + for (AbstractTreeIterator t : trees) { if (t.matches == ch) { t.skip(); t.matches = null; @@ -1398,10 +1396,8 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { * @param * a tree type. */ - public T getTree( - Class type) { - for (int i = 0; i < trees.length; i++) { - AbstractTreeIterator tree = trees[i]; + public T getTree(Class type) { + for (AbstractTreeIterator tree : trees) { if (type.isInstance(tree)) { return type.cast(tree); } -- cgit v1.2.3