| commit | f8d7eba4c097212786166fed76c612c94ec22298 | [log] [tgz] |
|---|---|---|
| author | lgoubet <laurent.goubet@obeo.fr> | Mon Jun 13 10:52:18 2022 +0200 |
| committer | lgoubet <laurent.goubet@obeo.fr> | Mon Jun 13 10:53:51 2022 +0200 |
| tree | f5048d6484d0d42dbecb3c39b2d315d58652de59 | |
| parent | 3031afee458760a68944f0da060eaea770ac913c [diff] |
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
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 53868e9..26cd2a6 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 @@ } return adapter.cast(getShowInSource(null)); } else if (adapter == Repository.class) { - return adapter.cast(adapter); + return adapter.cast(repository); } return super.getAdapter(adapter); }