Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-04-18 09:43:12 +0000
committerAndrey Loskutov2015-04-18 09:43:12 +0000
commit0f95e0f39540971f8a5ea4da1d0b0f3d36c6d62e (patch)
tree785f588cd92f40e515b0a4e592d15b0486f5657d /org.eclipse.egit.core.test
parent02f9ebaa09f8559bdc6731d975d735d4bbe4c67e (diff)
downloadegit-0f95e0f39540971f8a5ea4da1d0b0f3d36c6d62e.tar.gz
egit-0f95e0f39540971f8a5ea4da1d0b0f3d36c6d62e.tar.xz
egit-0f95e0f39540971f8a5ea4da1d0b0f3d36c6d62e.zip
Fix unnecessary cast errors from generified IAdaptable#getAdapter(..)
Bug: 460685 Change-Id: Iec050627f71b31f0b10b19771b67e5eb86f1aa86 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
index e326f49566..1ce3603abf 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/models/ModelTestCase.java
@@ -30,6 +30,7 @@ import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.egit.core.AdapterUtils;
+import org.eclipse.egit.core.internal.Utils;
import org.eclipse.egit.core.op.MergeOperation;
import org.eclipse.egit.core.synchronize.GitResourceVariantTreeSubscriber;
import org.eclipse.egit.core.synchronize.GitSubscriberMergeContext;
@@ -44,7 +45,6 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.team.core.mapping.IMergeContext;
import org.eclipse.team.core.mapping.IResourceMappingMerger;
-import org.eclipse.team.core.mapping.ResourceMappingMerger;
import org.eclipse.team.core.subscribers.SubscriberScopeManager;
import org.junit.Before;
@@ -105,8 +105,7 @@ public abstract class ModelTestCase extends GitTestCase {
.getModelProviderDescriptor(
SampleModelProvider.SAMPLE_PROVIDER_ID)
.getModelProvider();
- return (ResourceMappingMerger) Platform.getAdapterManager().getAdapter(
- provider, IResourceMappingMerger.class);
+ return Utils.getAdapter(provider, IResourceMappingMerger.class);
}
protected IMergeContext prepareContext(Repository repository,

Back to the top