[PATCH JGIT] use java 5 like for loops

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



in for loops that use an iterator or an index (int i), use instead a
loop like: for (Element e : elements)
Signed-off-by: Yann Simon <yann.simon.fr@xxxxxxxxx>
---
 .../src/org/spearce/jgit/lib/GitIndex.java         |    6 ++----
 .../src/org/spearce/jgit/lib/Repository.java       |    4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java
b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java
index 6eeccff..920a9c9 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/GitIndex.java
@@ -754,8 +754,7 @@ public Entry addEntry(TreeEntry te) throws
IOException {
 	 * @throws IOException
 	 */
 	public void checkout(File wd) throws IOException {
-		for (Iterator i = entries.values().iterator(); i.hasNext();) {
-			Entry e = (Entry) i.next();
+		for (Entry e : entries.values()) {
 			if (e.getStage() != 0)
 				continue;
 			checkoutEntry(wd, e);
@@ -808,8 +807,7 @@ public ObjectId writeTree() throws IOException {
 		Stack<Tree> trees = new Stack<Tree>();
 		trees.push(current);
 		String[] prevName = new String[0];
-		for (Iterator i = entries.values().iterator(); i.hasNext();) {
-			Entry e = (Entry) i.next();
+		for (Entry e : entries.values()) {
 			if (e.getStage() != 0)
 				continue;
 			String[] newName = splitDirPath(e.getName());
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
index e1c4049..038a869 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/Repository.java
@@ -231,8 +231,8 @@ public File toFile(final AnyObjectId objectId) {
 		String d=n.substring(0, 2);
 		String f=n.substring(2);
 		final File[] objectsDirs = objectsDirs();
-		for (int i=0; i<objectsDirs.length; ++i) {
-			File ret = new File(new File(objectsDirs[i], d), f);
+		for (File objectsDir : objectsDirs) {
+			File ret = new File(new File(objectsDir, d), f);
 			if (ret.exists())
 				return ret;
 		}
-- 
1.6.0.6


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux