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 <carsten.hammer@t-online.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v5.4.0.201905081430-m2
if (!dir.exists()) | if (!dir.exists()) | ||||
return silent; | return silent; | ||||
final File[] ls = dir.listFiles(); | final File[] ls = dir.listFiles(); | ||||
if (ls != null) | |||||
for (int k = 0; k < ls.length; k++) { | |||||
final File e = ls[k]; | |||||
if (e.isDirectory()) | |||||
silent = recursiveDelete(e, silent, failOnError); | |||||
else if (!e.delete()) { | |||||
if (!silent) | |||||
reportDeleteFailure(failOnError, e); | |||||
if (ls != null) { | |||||
for (File f : ls) { | |||||
if (f.isDirectory()) { | |||||
silent = recursiveDelete(f, silent, failOnError); | |||||
} else if (!f.delete()) { | |||||
if (!silent) { | |||||
reportDeleteFailure(failOnError, f); | |||||
} | |||||
silent = !failOnError; | silent = !failOnError; | ||||
} | } | ||||
} | } | ||||
} | |||||
if (!dir.delete()) { | if (!dir.delete()) { | ||||
if (!silent) | if (!silent) | ||||
reportDeleteFailure(failOnError, dir); | reportDeleteFailure(failOnError, dir); |
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
assertFalse(dc.hasUnmergedPaths()); | assertFalse(dc.hasUnmergedPaths()); | ||||
ents[2].setFileMode(FileMode.REGULAR_FILE); | ents[2].setFileMode(FileMode.REGULAR_FILE); | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
assertTrue(dc.hasUnmergedPaths()); | assertTrue(dc.hasUnmergedPaths()); | ||||
} | } |
} | } | ||||
{ | { | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
} | } | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
assertEquals(paths.length, dc.getEntryCount()); | assertEquals(paths.length, dc.getEntryCount()); | ||||
} | } | ||||
{ | { | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
} | } | ||||
assertEquals(paths.length, dc.getEntryCount()); | assertEquals(paths.length, dc.getEntryCount()); |
final int aLast = 3; | final int aLast = 3; | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
assertEquals(paths.length, dc.getEntryCount()); | assertEquals(paths.length, dc.getEntryCount()); |
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
final DirCacheIterator i = new DirCacheIterator(dc); | final DirCacheIterator i = new DirCacheIterator(dc); | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
final DirCacheIterator i = new DirCacheIterator(dc); | final DirCacheIterator i = new DirCacheIterator(dc); | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
final String[] expPaths = { "a-", "a", "a0b" }; | final String[] expPaths = { "a-", "a", "a0b" }; | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
final DirCacheIterator i = new DirCacheIterator(dc); | final DirCacheIterator i = new DirCacheIterator(dc); | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
try (TreeWalk tw = new TreeWalk(db)) { | try (TreeWalk tw = new TreeWalk(db)) { | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
DirCacheIterator dci = new DirCacheIterator(dc); | DirCacheIterator dci = new DirCacheIterator(dc); | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
DirCacheIterator dci = new DirCacheIterator(dc); | DirCacheIterator dci = new DirCacheIterator(dc); | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
try (TreeWalk tw = new TreeWalk(db)) { | try (TreeWalk tw = new TreeWalk(db)) { |
final int aLast = 3; | final int aLast = 3; | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
assertNull(dc.getCacheTree(false)); | assertNull(dc.getCacheTree(false)); | ||||
final int acLast = 3; | final int acLast = 3; | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.finish(); | b.finish(); | ||||
assertNull(dc.getCacheTree(false)); | assertNull(dc.getCacheTree(false)); | ||||
} | } | ||||
final DirCacheBuilder b = dc.builder(); | final DirCacheBuilder b = dc.builder(); | ||||
for (int i = 0; i < ents.length; i++) | |||||
b.add(ents[i]); | |||||
for (DirCacheEntry ent : ents) { | |||||
b.add(ent); | |||||
} | |||||
b.commit(); | b.commit(); | ||||
DirCache read = db.readDirCache(); | DirCache read = db.readDirCache(); |
} | } | ||||
final File[] ls = dir.listFiles(); | final File[] ls = dir.listFiles(); | ||||
if (ls != null) { | if (ls != null) { | ||||
for (int i = 0; i < ls.length; i++) { | |||||
FileUtils.delete(ls[i], RECURSIVE); | |||||
for (File f : ls) { | |||||
FileUtils.delete(f, RECURSIVE); | |||||
} | } | ||||
} | } | ||||
} | } |
int getMemoryUsedByTableForTest() { | int getMemoryUsedByTableForTest() { | ||||
int r = 0; | 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; | r += e.data.length; | ||||
} | } | ||||
} | } |
// check whether the found new ref is the an additional ref. These refs | // check whether the found new ref is the an additional ref. These refs | ||||
// should not go into looseRefs | // 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; | return n; | ||||
} | |||||
} | |||||
if (looseRefs.compareAndSet(curList, curList.add(idx, n))) | if (looseRefs.compareAndSet(curList, curList.add(idx, n))) | ||||
modCnt.incrementAndGet(); | modCnt.incrementAndGet(); |
final MutableInteger ptr = new MutableInteger(); | final MutableInteger ptr = new MutableInteger(); | ||||
ptr.value = nextLF(buf, startOffset, ' '); | 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); | newStartLine = parseBase10(buf, ptr.value + 1, ptr); |
drawLine(myColor, myLaneX, h, myLaneX, (h + dotSize) / 2, | drawLine(myColor, myLaneX, h, myLaneX, (h + dotSize) / 2, | ||||
LINE_WIDTH); | 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 TColor pColor = laneColor(pLane); | ||||
final int cx = laneC(pLane); | final int cx = laneC(pLane); | ||||
if (Math.abs(myLaneX - cx) > LANE_WIDTH) { | if (Math.abs(myLaneX - cx) > LANE_WIDTH) { | ||||
final int ix; | final int ix; | ||||
if (myLaneX < cx) | |||||
if (myLaneX < cx) { | |||||
ix = cx - LANE_WIDTH / 2; | ix = cx - LANE_WIDTH / 2; | ||||
else | |||||
} else { | |||||
ix = cx + LANE_WIDTH / 2; | ix = cx + LANE_WIDTH / 2; | ||||
} | |||||
drawLine(pColor, myLaneX, h / 2, ix, h / 2, LINE_WIDTH); | drawLine(pColor, myLaneX, h / 2, ix, h / 2, LINE_WIDTH); | ||||
drawLine(pColor, ix, h / 2, cx, h, LINE_WIDTH); | drawLine(pColor, ix, h / 2, cx, h, LINE_WIDTH); | ||||
} else | } else | ||||
drawLine(pColor, myLaneX, h / 2, cx, h, LINE_WIDTH); | drawLine(pColor, myLaneX, h / 2, cx, h, LINE_WIDTH); | ||||
maxCenter = Math.max(maxCenter, cx); | maxCenter = Math.max(maxCenter, cx); | ||||
} | } | ||||
} | } | ||||
if (commit.getChildCount() > 0) { | 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 TColor cColor = laneColor(childLane); | ||||
final int cx = laneC(childLane); | final int cx = laneC(childLane); | ||||
if (Math.abs(myLaneX - cx) > LANE_WIDTH) { | if (Math.abs(myLaneX - cx) > LANE_WIDTH) { | ||||
final int ix; | final int ix; | ||||
if (myLaneX < cx) | |||||
if (myLaneX < cx) { | |||||
ix = cx - LANE_WIDTH / 2; | ix = cx - LANE_WIDTH / 2; | ||||
else | |||||
} else { | |||||
ix = cx + LANE_WIDTH / 2; | ix = cx + LANE_WIDTH / 2; | ||||
} | |||||
drawLine(cColor, myLaneX, h / 2, ix, h / 2, LINE_WIDTH); | drawLine(cColor, myLaneX, h / 2, ix, h / 2, LINE_WIDTH); | ||||
drawLine(cColor, ix, h / 2, cx, 0, LINE_WIDTH); | drawLine(cColor, ix, h / 2, cx, 0, LINE_WIDTH); |
@Override | @Override | ||||
void popEntriesEqual() throws CorruptObjectException { | void popEntriesEqual() throws CorruptObjectException { | ||||
final AbstractTreeIterator ch = currentHead; | 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.matches == ch) { | ||||
if (t.matchShift == 0) | if (t.matchShift == 0) | ||||
t.next(1); | t.next(1); | ||||
@Override | @Override | ||||
void skipEntriesEqual() throws CorruptObjectException { | void skipEntriesEqual() throws CorruptObjectException { | ||||
final AbstractTreeIterator ch = currentHead; | 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.matches == ch) { | ||||
if (t.matchShift == 0) | if (t.matchShift == 0) | ||||
t.skip(); | t.skip(); |
void popEntriesEqual() throws CorruptObjectException { | void popEntriesEqual() throws CorruptObjectException { | ||||
final AbstractTreeIterator ch = currentHead; | 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.matches == ch) { | ||||
t.next(1); | t.next(1); | ||||
t.matches = null; | t.matches = null; | ||||
void skipEntriesEqual() throws CorruptObjectException { | void skipEntriesEqual() throws CorruptObjectException { | ||||
final AbstractTreeIterator ch = currentHead; | 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.matches == ch) { | ||||
t.skip(); | t.skip(); | ||||
t.matches = null; | t.matches = null; | ||||
* @param <T> | * @param <T> | ||||
* a tree type. | * a tree type. | ||||
*/ | */ | ||||
public <T extends AbstractTreeIterator> T getTree( | |||||
Class<T> type) { | |||||
for (int i = 0; i < trees.length; i++) { | |||||
AbstractTreeIterator tree = trees[i]; | |||||
public <T extends AbstractTreeIterator> T getTree(Class<T> type) { | |||||
for (AbstractTreeIterator tree : trees) { | |||||
if (type.isInstance(tree)) { | if (type.isInstance(tree)) { | ||||
return type.cast(tree); | return type.cast(tree); | ||||
} | } |