From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Mon, 23 Apr 2007 22:39:48 GMT
Subject: Re: [EGIT PATCH 2/4] Use the Git sort order.
Message-ID: <200704240039.48892.robin.rosenberg.lists@dewire.com>
In-Reply-To: <20070422213602.26396.59463.stgit@lathund.dewire.com>

Oops, lost the decoration here.

-- robin

diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java b/org.spearce.egit.core/src/org/spearce/egit
/core/project/GitProjectData.java
index 0c4683e..5c250c0 100644
--- a/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
+++ b/org.spearce.egit.core/src/org/spearce/egit/core/project/GitProjectData.java
@@ -274,11 +274,11 @@ public class GitProjectData {
                return (RepositoryMapping) c2mapping.get(r);
        }

-       public TreeEntry[] getActiveDiffTreeEntries(IResource r)
+       public TreeEntry[] getActiveDiffTreeEntries(IResource res)
                        throws CoreException {
                String s = null;
                RepositoryMapping m = null;
-
+               IResource r = res;
                while (r != null) {
                        m = getRepositoryMapping(r);
                        if (m != null) {
@@ -296,7 +296,7 @@ public class GitProjectData {

                if (s != null && m != null && m.getActiveDiff() != null) {
                        try {
-                               if (r.getType() == IResource.FILE)
+                               if (res.getType() == IResource.FILE)
                                        return m.getActiveDiff().findBlobMember(s);
                                else
                                        return m.getActiveDiff().findTreeMember(s);