Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2022-06-13 08:52:18 +0000
committerlgoubet2022-06-13 08:53:51 +0000
commitf8d7eba4c097212786166fed76c612c94ec22298 (patch)
treef5048d6484d0d42dbecb3c39b2d315d58652de59
parent3031afee458760a68944f0da060eaea770ac913c (diff)
downloadorg.eclipse.emf.compare-f8d7eba4c097212786166fed76c612c94ec22298.tar.gz
org.eclipse.emf.compare-f8d7eba4c097212786166fed76c612c94ec22298.tar.xz
org.eclipse.emf.compare-f8d7eba4c097212786166fed76c612c94ec22298.zip
CCE with getAdapter
This was a regression in a specific version o EGit that unfortunately found its way in compare as well. Porting the fix from EGit commit 0aee49637c6fa6508f7185f61d4f9759789ebd3e Bug: 579973 Change-Id: Ia821c066a4fc19f85445061fde3016c2c58e7084
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/AbstractGitCompareEditorInput.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/AbstractGitCompareEditorInput.java b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/AbstractGitCompareEditorInput.java
index 53868e93d..26cd2a6ca 100644
--- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/AbstractGitCompareEditorInput.java
+++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/AbstractGitCompareEditorInput.java
@@ -196,7 +196,7 @@ public abstract class AbstractGitCompareEditorInput extends CompareEditorInput {
}
return adapter.cast(getShowInSource(null));
} else if (adapter == Repository.class) {
- return adapter.cast(adapter);
+ return adapter.cast(repository);
}
return super.getAdapter(adapter);
}

Back to the top