diff options
| author | Matthias Sohn | 2011-08-17 18:41:55 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-08-17 18:41:55 +0000 |
| commit | 2007e13020bd1963b71e333e8f1223f5f928657a (patch) | |
| tree | 172ee9b41a951776a4447d9f262a29336e83bfb2 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions | |
| parent | 5ad6b5d7ce7d2978343835ef932dc98c12c26b98 (diff) | |
| download | egit-2007e13020bd1963b71e333e8f1223f5f928657a.tar.gz egit-2007e13020bd1963b71e333e8f1223f5f928657a.tar.xz egit-2007e13020bd1963b71e333e8f1223f5f928657a.zip | |
Fix compile error caused by moving CompareUtils
Change-Id: I0404aab29a98df516ed55632de67eacc96b8abf1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexActionHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexActionHandler.java index 728e8e744a..da361a432a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CompareWithIndexActionHandler.java @@ -20,6 +20,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; +import org.eclipse.egit.core.internal.CompareCoreUtils; import org.eclipse.egit.core.internal.storage.GitFileRevision; import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.egit.ui.Activator; @@ -107,7 +108,7 @@ public class CompareWithIndexActionHandler extends RepositoryActionHandler { } IFileRevision nextFile = GitFileRevision.inIndex(repository, gitPath); - String encoding = CompareUtils.getResourceEncoding(baseFile); + String encoding = CompareCoreUtils.getResourceEncoding(baseFile); final EditableRevision next = new EditableRevision(nextFile, encoding); IContentChangeListener listener = new IContentChangeListener() { |