Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-05-15 08:43:30 -0400
committerMatthias Sohn2019-06-10 19:13:00 -0400
commitacbd245305eab71839b2b8dbf2cd33737112a179 (patch)
tree3730e4ac4b24aba626d6c4baa9421821e8e34578 /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test
parentbfe19a05dd5832e65e97d6dffab8ba96ddebe025 (diff)
downloadegit-acbd245305eab71839b2b8dbf2cd33737112a179.tar.gz
egit-acbd245305eab71839b2b8dbf2cd33737112a179.tar.xz
egit-acbd245305eab71839b2b8dbf2cd33737112a179.zip
Remove pre-Mars adapter workaround
Since our minimum target is Mars, we no longer need the previous workaround for avoiding compiler warnings around adapters. This is not a git revert, but an inline refactoring of the previously introduced method. Also inline AdapterUtils.adapt() in such a way that Adapters.adapt() is called instead. Bug:460685 Change-Id: Idbbe4853f68a9b6d1ffff1f434bdbfb9bc705a80 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
index a7b7fe3cd..d8a128a9e 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.concurrent.atomic.AtomicReference;
+import org.eclipse.core.runtime.Adapters;
import org.eclipse.egit.core.Activator;
-import org.eclipse.egit.core.internal.Utils;
import org.eclipse.egit.ui.JobFamilies;
import org.eclipse.egit.ui.common.LocalRepositoryTestCase;
import org.eclipse.egit.ui.internal.UIText;
@@ -81,7 +81,7 @@ public class CommitEditorTest extends LocalRepositoryTestCase {
assertNotNull(editorRef.get());
IEditorPart editor = editorRef.get();
assertTrue(editor instanceof CommitEditor);
- RepositoryCommit adaptedCommit = Utils.getAdapter(editor,
+ RepositoryCommit adaptedCommit = Adapters.adapt(editor,
RepositoryCommit.class);
assertNotNull(adaptedCommit);
assertEquals(commit, adaptedCommit.getRevCommit());

Back to the top