From 2f6372337cfd5944e2179f5ec5e2dbe0cbc96386 Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Tue, 15 Jul 2014 11:32:23 +0200 Subject: Rename local variables/parameters to remove warnings about hiding Change-Id: I73f38492b6a2e7fd6e77005efd0a8a8c65763e74 --- .../src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/treewalk') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java index 2dd3c3aa14..41e593eaa2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/AbstractTreeIterator.java @@ -328,13 +328,13 @@ public abstract class AbstractTreeIterator { * position to start reading the raw buffer. * @param end * one past the end of the raw buffer (length is end - pos). - * @param mode + * @param pathMode * the mode of the path. * @return -1 if this entry sorts first; 0 if the entries are equal; 1 if * p's entry sorts first. */ - public int pathCompare(byte[] buf, int pos, int end, int mode) { - return pathCompare(buf, pos, end, mode, 0); + public int pathCompare(byte[] buf, int pos, int end, int pathMode) { + return pathCompare(buf, pos, end, pathMode, 0); } private int pathCompare(byte[] b, int bPos, int bEnd, int bMode, int aPos) { -- cgit v1.2.3