Fix misc spelling errors in comments and method names

Change-Id: I24552443710075856540696717ac4068dfe6a7f2
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
index 1f59dfdbdb8acbce9ed8ae5a6f78a539ff1f53f8..3ec09d42f19352513b474a6822e0060ac93bfbbf 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
@@ -112,7 +112,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
         * @throws NoMessageException
         *             when called without specifying a commit message
         * @throws UnmergedPathException
-        *             when the current index contained unmerged pathes (conflicts)
+        *             when the current index contained unmerged paths (conflicts)
         * @throws WrongRepositoryStateException
         *             when repository is not in the right state for committing
         * @throws JGitInternalException

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
index 1528e799ae33efb0527957e87c863040978390ec..42e1a51ac92fb98a48ee2488821e782059fef3c2 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java
@@ -182,7 +182,7 @@ public class MergeCommand extends GitCommand<MergeResult> {
                                        noProblems = merger.merge(headCommit, srcCommit);
                                        lowLevelResults = resolveMerger
                                                        .getMergeResults();
-                                       failingPaths = resolveMerger.getFailingPathes();
+                                       failingPaths = resolveMerger.getFailingPaths();
                                } else
                                        noProblems = merger.merge(headCommit, srcCommit);
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
index c856d1a7f5fbb2a327a62cf37d7cf2cca5cebd65..25209d982b3fb4a733c7bcc91c62809d9b889a40 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
@@ -107,7 +107,7 @@ public class DirCacheCheckout {
        private ArrayList<String> toBeDeleted = new ArrayList<String>();
 
        /**
-        * @return a list of updated pathes and objectIds
+        * @return a list of updated paths and objectIds
         */
        public Map<String, ObjectId> getUpdated() {
                return updated;

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 15309fcefc6159482bb3168c4da942f99fc186a7..e5861ec58c0f2b542c9d05f1d1d715c4d2ffd4b6 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -120,7 +120,7 @@ public class ResolveMerger extends ThreeWayMerger {
 
        private ObjectId resultTree;
 
-       private List<String> unmergedPathes = new ArrayList<String>();
+       private List<String> unmergedPaths = new ArrayList<String>();
 
        private List<String> modifiedFiles = new LinkedList<String>();
 
@@ -128,7 +128,7 @@ public class ResolveMerger extends ThreeWayMerger {
 
        private Map<String, MergeResult<? extends Sequence>> mergeResults = new HashMap<String, MergeResult<? extends Sequence>>();
 
-       private Map<String, MergeFailureReason> failingPathes = new HashMap<String, MergeFailureReason>();
+       private Map<String, MergeFailureReason> failingPaths = new HashMap<String, MergeFailureReason>();
 
        private ObjectInserter oi;
 
@@ -224,7 +224,7 @@ public class ResolveMerger extends ThreeWayMerger {
                                builder = null;
                        }
 
-                       if (getUnmergedPathes().isEmpty()) {
+                       if (getUnmergedPaths().isEmpty()) {
                                resultTree = dircache.writeTree(oi);
                                return true;
                        } else {
@@ -247,7 +247,7 @@ public class ResolveMerger extends ThreeWayMerger {
                                                entry.getValue());
                        } else {
                                if (!f.delete())
-                                       failingPathes.put(entry.getKey(),
+                                       failingPaths.put(entry.getKey(),
                                                        MergeFailureReason.COULD_NOT_DELETE);
                        }
                        modifiedFiles.add(entry.getKey());
@@ -369,7 +369,7 @@ public class ResolveMerger extends ThreeWayMerger {
                // Each index entry has to match ours, means: it has to be clean
                if (nonTree(modeI)
                                && !(tw.idEqual(T_INDEX, T_OURS) && modeO == modeI)) {
-                       failingPathes.put(tw.getPathString(), MergeFailureReason.DIRTY_INDEX);
+                       failingPaths.put(tw.getPathString(), MergeFailureReason.DIRTY_INDEX);
                        return false;
                }
 
@@ -416,7 +416,7 @@ public class ResolveMerger extends ThreeWayMerger {
                                if (nonTree(modeB))
                                        add(tw.getRawPath(), base, DirCacheEntry.STAGE_1);
                                add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2);
-                               unmergedPathes.add(tw.getPathString());
+                               unmergedPaths.add(tw.getPathString());
                                enterSubtree = false;
                                return true;
                        }
@@ -424,7 +424,7 @@ public class ResolveMerger extends ThreeWayMerger {
                                if (nonTree(modeB))
                                        add(tw.getRawPath(), base, DirCacheEntry.STAGE_1);
                                add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3);
-                               unmergedPathes.add(tw.getPathString());
+                               unmergedPaths.add(tw.getPathString());
                                enterSubtree = false;
                                return true;
                        }
@@ -447,14 +447,14 @@ public class ResolveMerger extends ThreeWayMerger {
                                if (work != null
                                                && (!nonTree(work.getEntryRawMode()) || work
                                                                .isModified(index.getDirCacheEntry(), true))) {
-                                       failingPathes.put(tw.getPathString(),
+                                       failingPaths.put(tw.getPathString(),
                                                        MergeFailureReason.DIRTY_WORKTREE);
                                        return false;
                                }
                        }
 
                        if (!contentMerge(base, ours, theirs)) {
-                               unmergedPathes.add(tw.getPathString());
+                               unmergedPaths.add(tw.getPathString());
                        }
                        modifiedFiles.add(tw.getPathString());
                }
@@ -573,15 +573,15 @@ public class ResolveMerger extends ThreeWayMerger {
         * @return the paths with conflicts. This is a subset of the files listed
         *         by {@link #getModifiedFiles()}
         */
-       public List<String> getUnmergedPathes() {
-               return unmergedPathes;
+       public List<String> getUnmergedPaths() {
+               return unmergedPaths;
        }
 
        /**
         * @return the paths of files which have been modified by this merge. A
         *         file will be modified if a content-merge works on this path or if
         *         the merge algorithm decides to take the theirs-version. This is a
-        *         superset of the files listed by {@link #getUnmergedPathes()}.
+        *         superset of the files listed by {@link #getUnmergedPaths()}.
         */
        public List<String> getModifiedFiles() {
                return modifiedFiles;
@@ -609,8 +609,8 @@ public class ResolveMerger extends ThreeWayMerger {
         *         a conflict). <code>null</code> is returned if this merge didn't
         *         fail abnormally.
         */
-       public Map<String, MergeFailureReason> getFailingPathes() {
-               return (failingPathes.size() == 0) ? null : failingPathes;
+       public Map<String, MergeFailureReason> getFailingPaths() {
+               return (failingPaths.size() == 0) ? null : failingPaths;
        }
 
        /**