diff options
author | Sergey Prigogin | 2016-08-24 11:53:18 +0000 |
---|---|---|
committer | Sergey Prigogin | 2016-08-24 11:53:18 +0000 |
commit | 610d92f8ebc9c90b9edbd289596a1681a92f1913 (patch) | |
tree | d672742994b2a3b2dd6fbfc38ac287f01a3fe442 | |
parent | 197e7f029ecc8b5217ce226bac3b4379df49c115 (diff) | |
download | eclipse.platform.team-610d92f8ebc9c90b9edbd289596a1681a92f1913.tar.gz eclipse.platform.team-610d92f8ebc9c90b9edbd289596a1681a92f1913.tar.xz eclipse.platform.team-610d92f8ebc9c90b9edbd289596a1681a92f1913.zip |
Bug 491036 - Eliminate Utils.getAdapter(Object, Class) in favor of
Adapters.adapt
Change-Id: I710ccfa96a6e3c6c329a57197273d2db524f0098
36 files changed, 74 insertions, 88 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java index cfa509685..e567b17e9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java @@ -1210,7 +1210,7 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC protected static ICVSFile getCVSFile(Object object) { // First, adapt to IResource and ensure mapped to CVS - IResource resource = (IResource)Utils.getAdapter(object, IResource.class); + IResource resource = (IResource)Adapters.adapt(object, IResource.class); if (resource instanceof IFile) { RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject()); if (provider instanceof CVSTeamProvider) @@ -1218,22 +1218,22 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC return null; } // Second, try ICVSFile - ICVSFile remoteFile = (ICVSFile)Utils.getAdapter(object, ICVSFile.class); + ICVSFile remoteFile = (ICVSFile)Adapters.adapt(object, ICVSFile.class); if (remoteFile != null) { return remoteFile; } // Next, try ICVSResource - ICVSResource remote = (ICVSResource)Utils.getAdapter(object, ICVSResource.class); + ICVSResource remote = (ICVSResource)Adapters.adapt(object, ICVSResource.class); if (remote instanceof RemoteFile) { return (ICVSFile)remote; } // Next, try IResourceVariant - IResourceVariant variant = (IResourceVariant)Utils.getAdapter(object, IResourceVariant.class); + IResourceVariant variant = (IResourceVariant)Adapters.adapt(object, IResourceVariant.class); if (variant instanceof RemoteFile) { return (ICVSFile)remote; } // Finally, try IFileRevision - IFileRevision revision = (IFileRevision)Utils.getAdapter(object, IFileRevision.class); + IFileRevision revision = (IFileRevision)Adapters.adapt(object, IFileRevision.class); if (revision instanceof CVSFileRevision) { return ((CVSFileRevision)revision).getCVSRemoteFile(); } @@ -1896,7 +1896,7 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC if (fileObject instanceof LocalFileRevision) { try { IStorage storage = ((LocalFileRevision) fileObject).getStorage(new NullProgressMonitor()); - if (Utils.getAdapter(storage, IFileState.class) != null) { + if (Adapters.adapt(storage, IFileState.class) != null) { //local revision label = NLS.bind(TeamUIMessages.CompareFileRevisionEditorInput_localRevision, new Object[]{element.getName(), ((FileRevisionTypedElement) element).getTimestamp()}); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java index 677e0690a..da8b1fff4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java @@ -39,7 +39,6 @@ import org.eclipse.team.internal.ccvs.ui.subscriber.LogEntryCacheUpdateHandler; import org.eclipse.team.internal.ccvs.ui.subscriber.LogEntryCacheUpdateHandler.ILogsFetchedListener; import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter; import org.eclipse.team.internal.core.subscribers.*; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; @@ -405,7 +404,7 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem } private SyncInfoToDiffConverter getConverter() { - SyncInfoToDiffConverter converter = (SyncInfoToDiffConverter)Utils.getAdapter(subscriber, SyncInfoToDiffConverter.class); + SyncInfoToDiffConverter converter = (SyncInfoToDiffConverter)Adapters.adapt(subscriber, SyncInfoToDiffConverter.class); if (converter == null) converter = SyncInfoToDiffConverter.getDefault(); return converter; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java index 664ee810e..25ba22a07 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java @@ -92,7 +92,7 @@ public class MergeSubscriberContext extends CVSSubscriberMergeContext { IThreeWayDiff twd = (IThreeWayDiff) diff; if (twd.getKind() == IDiff.ADD && twd.getDirection() == IThreeWayDiff.INCOMING) { IFileRevision remote = Utils.getRemote(diff); - IResourceVariant variant = (IResourceVariant)Utils.getAdapter(remote, IResourceVariant.class); + IResourceVariant variant = (IResourceVariant)Adapters.adapt(remote, IResourceVariant.class); byte[] syncBytes = variant.asBytes(); MutableResourceSyncInfo info = new MutableResourceSyncInfo(resource.getName(), ResourceSyncInfo.ADDED_REVISION); info.setKeywordMode(ResourceSyncInfo.getKeywordMode(syncBytes)); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java index 876f12dae..1e3c85bce 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java @@ -15,8 +15,7 @@ import java.util.List; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.ResourceMapping; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.*; import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.diff.IDiff; @@ -32,7 +31,6 @@ import org.eclipse.team.internal.ccvs.core.client.listeners.UpdateListener; import org.eclipse.team.internal.ccvs.core.resources.RemoteFile; import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.IWorkbenchPart; /** @@ -78,7 +76,7 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation IResource local = getTree().getResource(node); IFileRevision remote = getRemoteFileState(twd); if (remote != null) { - IResourceVariant variant = (IResourceVariant)Utils.getAdapter(remote, IResourceVariant.class); + IResourceVariant variant = (IResourceVariant)Adapters.adapt(remote, IResourceVariant.class); if (local.getType() == IResource.FILE && isEnabledForDirection(twd.getDirection()) && variant instanceof RemoteFile) { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java index f57e20152..3e06812dc 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java @@ -193,8 +193,7 @@ public class CommitWizard extends ResizableWizard { private void getAllOutOfSync() throws CVSException { try { ISynchronizationContext context = getParticipant().getContext(); - SubscriberDiffTreeEventHandler handler = (SubscriberDiffTreeEventHandler) Utils - .getAdapter(context, SubscriberDiffTreeEventHandler.class); + SubscriberDiffTreeEventHandler handler = (SubscriberDiffTreeEventHandler) Adapters.adapt(context, SubscriberDiffTreeEventHandler.class); handler.initializeIfNeeded(); Job.getJobManager().join(context, null); } catch (InterruptedException e) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java index 4484ffffb..25a95b44c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java @@ -619,7 +619,7 @@ public class Utils { if (isContributed) { adapted = getResource(element); } else { - adapted = getAdapter(element, IResource.class); + adapted = Adapters.adapt(element, IResource.class); } if (adapted instanceof IResource) { IResource resource = (IResource) adapted; @@ -631,7 +631,7 @@ public class Utils { if (isContributed) { adapted = getResourceMapping(element); } else { - adapted = getAdapter(element, ResourceMapping.class); + adapted = Adapters.adapt(element, ResourceMapping.class); } if (adapted instanceof ResourceMapping && includeMappingResources) { isResource = true; @@ -677,10 +677,6 @@ public class Utils { return getResources(elements, null, true /* isContributed */, true /* isIncudeMappings */); } - public static <T> T getAdapter(Object element, Class<T> adapterType) { - return Adapters.adapt(element, adapterType); - } - /** * Return whether any sync nodes in the given selection or their * descendants match the given filter. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java index 6c06f9ef3..6360fff9a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java @@ -279,10 +279,10 @@ public class CompareFileRevisionEditorInput extends SaveableCompareEditorInput { if (fileObject instanceof LocalFileRevision){ try { IStorage storage = ((LocalFileRevision) fileObject).getStorage(new NullProgressMonitor()); - if (Utils.getAdapter(storage, IFileState.class) != null){ + if (Adapters.adapt(storage, IFileState.class) != null){ //local revision return TeamUIMessages.CompareFileRevisionEditorInput_0; - } else if (Utils.getAdapter(storage, IFile.class) != null) { + } else if (Adapters.adapt(storage, IFile.class) != null) { //current revision return TeamUIMessages.CompareFileRevisionEditorInput_1; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java index 0751b45e9..80b717d10 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionEditorInput.java @@ -20,7 +20,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osgi.util.NLS; import org.eclipse.team.core.history.IFileRevision; import org.eclipse.team.internal.ui.TeamUIMessages; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.IPersistableElement; import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.model.IWorkbenchAdapter; @@ -192,7 +191,7 @@ public class FileRevisionEditorInput extends PlatformObject implements IWorkbenc Object object = super.getAdapter(adapter); if (object != null) return (T) object; - return Utils.getAdapter(fileRevision, adapter); + return Adapters.adapt(fileRevision, adapter); } @Override diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java index c3fd377a1..1bdaf7b09 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryView.java @@ -525,7 +525,7 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP SyncInfoModelElement syncInfoModelElement = (SyncInfoModelElement) lastSelectedElement; resource = syncInfoModelElement.getSyncInfo().getLocal(); } else { - resource= Utils.getAdapter(lastSelectedElement, IResource.class); + resource= Adapters.adapt(lastSelectedElement, IResource.class); } if (resource != null) showHistoryPageFor(resource, false, false, null); @@ -627,7 +627,7 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP return pageSource; IResource resource = Utils.getResource(object); if (resource == null) { - return Utils.getAdapter(object, IHistoryPageSource.class); + return Adapters.adapt(object, IHistoryPageSource.class); } else { if (resource.getProject() == null) return null; @@ -799,7 +799,7 @@ public class GenericHistoryView extends PageBookView implements IHistoryView, IP showHistory(file); /* don't fetch if already cached */ } else { // see if it adapts to an IHistoryPageSource - Object pageSource = Utils.getAdapter(input, IHistoryPageSource.class); + Object pageSource = Adapters.adapt(input, IHistoryPageSource.class); if (pageSource != null) showHistory(input); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java index 558ae8f58..d9c6b216b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryTableProvider.java @@ -15,6 +15,7 @@ import java.util.Date; import org.eclipse.compare.IModificationDate; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFileState; +import org.eclipse.core.runtime.Adapters; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.util.IPropertyChangeListener; @@ -306,7 +307,7 @@ public class LocalHistoryTableProvider { } protected long getModificationDate(Object element) { - IModificationDate md = Utils.getAdapter(element, IModificationDate.class); + IModificationDate md = Adapters.adapt(element, IModificationDate.class); if (md != null) return md.getModificationDate(); if (element instanceof IFileState) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java index 411613c33..be4f1c733 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java @@ -139,7 +139,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements } private boolean hasChangesFor(String id, ISynchronizationCompareAdapter adapter, ISynchronizationContext context, int[] states, int mask) { - ITraversalFactory factory = (ITraversalFactory)Utils.getAdapter(adapter, ITraversalFactory.class); + ITraversalFactory factory = (ITraversalFactory)Adapters.adapt(adapter, ITraversalFactory.class); ResourceTraversal[] traversals; if (factory == null) { traversals = context.getScope().getTraversals(id); @@ -456,7 +456,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements } private SubscriberDiffTreeEventHandler getHandler() { - return (SubscriberDiffTreeEventHandler)Utils.getAdapter(context, SubscriberDiffTreeEventHandler.class); + return (SubscriberDiffTreeEventHandler)Adapters.adapt(context, SubscriberDiffTreeEventHandler.class); } private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java index 235924fb7..39f19b934 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java @@ -135,7 +135,7 @@ public class ModelCompareEditorInput extends SaveableCompareEditorInput implemen } private ISynchronizationCompareInput asModelCompareInput(ICompareInput input) { - return (ISynchronizationCompareInput)Utils.getAdapter(input, ISynchronizationCompareInput.class); + return (ISynchronizationCompareInput)Adapters.adapt(input, ISynchronizationCompareInput.class); } /** diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java index fe73ea226..b4ee2e2cf 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipant.java @@ -15,18 +15,15 @@ import java.util.Set; import org.eclipse.core.resources.*; import org.eclipse.core.resources.mapping.*; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.*; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.team.core.mapping.*; import org.eclipse.team.internal.ui.TeamUIPlugin; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.*; public class ResourceModelScopeParticipant implements ISynchronizationScopeParticipant, IResourceChangeListener, IPropertyChangeListener { - private final ModelProvider provider; private final ISynchronizationScope scope; @@ -96,7 +93,7 @@ public class ResourceModelScopeParticipant implements IAdaptable[] elements = set.getElements(); for (int j = 0; j < elements.length; j++) { IAdaptable adaptable = elements[j]; - ResourceMapping m = (ResourceMapping)Utils.getAdapter(adaptable, ResourceMapping.class); + ResourceMapping m = (ResourceMapping)Adapters.adapt(adaptable, ResourceMapping.class); if (m != null) { IProject[] p = m.getProjects(); for (int k = 0; k < p.length; k++) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java index f6b6ec5eb..d167ee887 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/WorkspaceTeamStateProvider.java @@ -124,7 +124,7 @@ public class WorkspaceTeamStateProvider extends TeamStateProvider private ITeamStateProvider getDecoratedStateProvider(Object element) { RepositoryProviderType type = getProviderType(element); if (type != null) - return Utils.getAdapter(type, ITeamStateProvider.class); + return Adapters.adapt(type, ITeamStateProvider.class); return null; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java index ce48c8639..a522a3a6d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java @@ -367,7 +367,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison if (fileElement instanceof LocalResourceTypedElement) { LocalResourceTypedElement lrte = (LocalResourceTypedElement) fileElement; if (lrte.isConnected()) { - ISharedDocumentAdapter sda = (ISharedDocumentAdapter)Utils.getAdapter(lrte, ISharedDocumentAdapter.class); + ISharedDocumentAdapter sda = (ISharedDocumentAdapter)Adapters.adapt(lrte, ISharedDocumentAdapter.class); if (sda != null) { IEditorInput input = sda.getDocumentKey(lrte); if (input != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java index c4fd5b8e3..3af8561b6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java @@ -103,8 +103,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements private ISaveablesLifecycleListener getSaveablesLifecycleListener( IWorkbenchPart part) { - ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener) Utils - .getAdapter(part, ISaveablesLifecycleListener.class); + ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener) Adapters.adapt(part, ISaveablesLifecycleListener.class); if (listener == null) listener = (ISaveablesLifecycleListener) part.getSite().getService( ISaveablesLifecycleListener.class); @@ -834,7 +833,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements if (provider instanceof ITextViewer) { final ITextViewer v= (ITextViewer)provider; IDocument d= v.getDocument(); - IDocument other= (IDocument)Utils.getAdapter(saveable, IDocument.class); + IDocument other= (IDocument)Adapters.adapt(saveable, IDocument.class); if (d == other) { if (element instanceof IResourceProvider) { IResourceProvider rp= (IResourceProvider)element; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java index 805a33fb5..1a42060f1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java @@ -13,6 +13,7 @@ package org.eclipse.team.internal.ui.synchronize; import java.util.Date; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osgi.util.NLS; import org.eclipse.team.internal.ui.*; @@ -78,7 +79,7 @@ public class SubscriberRefreshSchedule { return null; } private IRefreshable getRefreshable(ISynchronizeParticipant participant) { - return (IRefreshable)Utils.getAdapter(participant, IRefreshable.class); + return (IRefreshable)Adapters.adapt(participant, IRefreshable.class); } }; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java index 6fe37c0e4..d9c23a8dc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ui.synchronize.actions; +import org.eclipse.core.runtime.Adapters; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.CompositeImageDescriptor; @@ -99,7 +100,7 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert drawImage(scheduledData, 0, 0); } } else { - SubscriberRefreshSchedule schedule = (SubscriberRefreshSchedule)Utils.getAdapter(participant, SubscriberRefreshSchedule.class); + SubscriberRefreshSchedule schedule = (SubscriberRefreshSchedule)Adapters.adapt(participant, SubscriberRefreshSchedule.class); if(schedule!=null && schedule.isEnabled()) { drawImage(scheduledData, 0, 0); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java index 28f52e69a..0bc443a77 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.*; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizard; import org.eclipse.team.internal.ui.TeamUIPlugin; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.IConfigurationWizard; import org.eclipse.team.ui.IConfigurationWizardExtension; import org.eclipse.ui.*; @@ -62,7 +61,7 @@ public class ConfigurationWizardElement extends WorkbenchAdapter implements IAda public IWizard createExecutableExtension(IProject[] projects) throws CoreException { IWorkbench workbench = PlatformUI.getWorkbench(); IConfigurationWizard wizard = (IConfigurationWizard)createExecutableExtension(); - IConfigurationWizardExtension extension = (IConfigurationWizardExtension)Utils.getAdapter(wizard, IConfigurationWizardExtension.class); + IConfigurationWizardExtension extension = (IConfigurationWizardExtension)Adapters.adapt(wizard, IConfigurationWizardExtension.class); if (extension == null) { if (projects.length == 1) { wizard.init(workbench, projects[0]); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java index ad5e43975..ca283f433 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java @@ -19,8 +19,7 @@ import org.eclipse.compare.contentmergeviewer.IFlushable; import org.eclipse.compare.internal.CompareEditor; import org.eclipse.compare.internal.CompareEditorInputNavigator; import org.eclipse.compare.structuremergeviewer.ICompareInput; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.*; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.util.IPropertyChangeListener; @@ -428,7 +427,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC for (int i=0; i<fDirtyViewers.size(); i++){ Object element = iter.next(); - IFlushable flushable = (IFlushable)Utils.getAdapter(element, IFlushable.class); + IFlushable flushable = (IFlushable)Adapters.adapt(element, IFlushable.class); if (flushable != null) flushable.flush(monitor); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java index 140b61997..600eac128 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java @@ -15,8 +15,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareViewerPane; import org.eclipse.compare.structuremergeviewer.ICompareInput; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.*; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; @@ -111,7 +110,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput { ICompareInput compareInput = super.asCompareInput(selection); if (compareInput != null) return compareInput; - IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Utils.getAdapter(historyPage, IHistoryCompareAdapter.class); + IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Adapters.adapt(historyPage, IHistoryCompareAdapter.class); if (compareAdapter != null){ if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; @@ -139,7 +138,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput { protected void prepareInput(ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) throws InvocationTargetException { - IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Utils.getAdapter(historyPage, IHistoryCompareAdapter.class); + IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Adapters.adapt(historyPage, IHistoryCompareAdapter.class); if (compareAdapter != null){ compareAdapter.prepareInput(input, configuration, monitor); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java index 682457d91..55109ba38 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java @@ -16,6 +16,7 @@ import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.IContentChangeNotifier; import org.eclipse.compare.structuremergeviewer.ICompareInput; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.viewers.*; @@ -142,7 +143,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart { ICompareInput compareInput = super.getCompareInput(selection); if (compareInput != null) return compareInput; - IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Utils.getAdapter(historyPage, IHistoryCompareAdapter.class); + IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Adapters.adapt(historyPage, IHistoryCompareAdapter.class); if (compareAdapter != null){ if (selection instanceof IStructuredSelection) { IStructuredSelection ss= (IStructuredSelection) selection; @@ -160,7 +161,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart { */ @Override protected void prepareInput(ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) throws InvocationTargetException { - IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Utils.getAdapter(historyPage, IHistoryCompareAdapter.class); + IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Adapters.adapt(historyPage, IHistoryCompareAdapter.class); if (compareAdapter != null){ compareAdapter.prepareInput(input, configuration, monitor); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSource.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSource.java index d75ad2de0..77a0a8c8b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSource.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSource.java @@ -11,6 +11,7 @@ package org.eclipse.team.ui.history; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Adapters; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.history.IFileHistoryProvider; import org.eclipse.team.internal.ui.Utils; @@ -37,16 +38,16 @@ public abstract class HistoryPageSource implements IHistoryPageSource { if (provider != null) { IFileHistoryProvider fileHistoryProvider = provider.getFileHistoryProvider(); if (fileHistoryProvider != null) { - IHistoryPageSource pageSource = (IHistoryPageSource)Utils.getAdapter(fileHistoryProvider, IHistoryPageSource.class); + IHistoryPageSource pageSource = (IHistoryPageSource)Adapters.adapt(fileHistoryProvider, IHistoryPageSource.class); if (pageSource != null) return pageSource; } - IHistoryPageSource pageSource = (IHistoryPageSource)Utils.getAdapter(provider, IHistoryPageSource.class); + IHistoryPageSource pageSource = (IHistoryPageSource)Adapters.adapt(provider, IHistoryPageSource.class); if (pageSource != null) return pageSource; } } - IHistoryPageSource pageSource = (IHistoryPageSource)Utils.getAdapter(object, IHistoryPageSource.class); + IHistoryPageSource pageSource = (IHistoryPageSource)Adapters.adapt(object, IHistoryPageSource.class); return pageSource; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java index a2b742225..d7cdf17a3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.revisions.*; import org.eclipse.jface.viewers.*; @@ -390,11 +391,11 @@ public abstract class RevisionAnnotationController { * @return the id of the entry */ protected String getRevisionId(Object historyEntry) { - IFileRevision revision= (IFileRevision)Utils.getAdapter(historyEntry, IFileRevision.class); + IFileRevision revision= (IFileRevision)Adapters.adapt(historyEntry, IFileRevision.class); if (revision != null) { return revision.getContentIdentifier(); } - IResourceVariant variant = (IResourceVariant)Utils.getAdapter(historyEntry, IResourceVariant.class); + IResourceVariant variant = (IResourceVariant)Adapters.adapt(historyEntry, IResourceVariant.class); if (variant != null) return variant.getContentIdentifier(); return null; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java index 790ff2a6e..54fe9a87a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java @@ -69,8 +69,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC @Override public String getName(ResourceMapping mapping) { Object object = mapping.getModelObject(); - IWorkbenchAdapter adapter = (IWorkbenchAdapter) Utils.getAdapter( - object, IWorkbenchAdapter.class); + IWorkbenchAdapter adapter = (IWorkbenchAdapter) Adapters.adapt(object, IWorkbenchAdapter.class); if (adapter != null) { String label = adapter.getLabel(object); if (label != null) @@ -95,8 +94,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC @Override public String getPathString(ResourceMapping mapping) { Object object = mapping.getModelObject(); - IWorkbenchAdapter adapter = (IWorkbenchAdapter) Utils.getAdapter( - object, IWorkbenchAdapter.class); + IWorkbenchAdapter adapter = (IWorkbenchAdapter) Adapters.adapt(object, IWorkbenchAdapter.class); if (adapter != null) { List segments = new ArrayList(); Object parent = object; @@ -143,8 +141,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC } private ImageDescriptor getImageDescriptorFromWorkbenchAdapter(Object object) { - IWorkbenchAdapter adapter = (IWorkbenchAdapter) Utils.getAdapter( - object, IWorkbenchAdapter.class); + IWorkbenchAdapter adapter = (IWorkbenchAdapter) Adapters.adapt(object, IWorkbenchAdapter.class); if (adapter != null) { return adapter.getImageDescriptor(object); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java index 3ed2c7b8e..2ace5227a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java @@ -99,7 +99,7 @@ public abstract class ModelMergeOperation extends ModelOperation { */ private static IResourceMappingMerger getMerger(ModelProvider provider) { Assert.isNotNull(provider); - return (IResourceMappingMerger)Utils.getAdapter(provider, IResourceMappingMerger.class); + return (IResourceMappingMerger)Adapters.adapt(provider, IResourceMappingMerger.class); } /** diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java index 24c9a0a57..73e16119a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java @@ -685,7 +685,7 @@ public class ModelSynchronizeParticipant extends } private SubscriberDiffTreeEventHandler getHandler() { - return (SubscriberDiffTreeEventHandler)Utils.getAdapter(context, SubscriberDiffTreeEventHandler.class); + return (SubscriberDiffTreeEventHandler)Adapters.adapt(context, SubscriberDiffTreeEventHandler.class); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java index 6cefefe79..867bb0927 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java @@ -221,7 +221,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput { } private ISynchronizationCompareInput asModelCompareInput(ICompareInput input) { - return (ISynchronizationCompareInput)Utils.getAdapter(input, ISynchronizationCompareInput.class); + return (ISynchronizationCompareInput)Adapters.adapt(input, ISynchronizationCompareInput.class); } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java index f4be4324f..80136c86a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java @@ -42,7 +42,6 @@ import org.eclipse.ui.part.IPageBookViewPage; */ @Deprecated public class ParticipantPageSaveablePart extends PageSaveablePart implements IContentChangeListener { - private ISynchronizeParticipant participant; private ISynchronizePageConfiguration pageConfiguration; private Image titleImage; @@ -280,7 +279,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo } private ISynchronizationCompareInput asModelCompareInput(ICompareInput input) { - return (ISynchronizationCompareInput)Utils.getAdapter(input, ISynchronizationCompareInput.class); + return (ISynchronizationCompareInput)Adapters.adapt(input, ISynchronizationCompareInput.class); } private SyncInfoModelElement getElement(ISelection selection) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java index cfe334c20..e0ee330f0 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java @@ -211,7 +211,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl private ISaveablesLifecycleListener getSaveablesLifecycleListener( IWorkbenchPart part) { - ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener)Utils.getAdapter(part, ISaveablesLifecycleListener.class); + ISaveablesLifecycleListener listener = (ISaveablesLifecycleListener)Adapters.adapt(part, ISaveablesLifecycleListener.class); if (listener == null) listener = (ISaveablesLifecycleListener) part.getSite().getService(ISaveablesLifecycleListener.class); return listener; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java index e18ada731..5615cb9bd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java @@ -13,8 +13,7 @@ package org.eclipse.team.ui.synchronize; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.*; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.*; import org.eclipse.team.core.RepositoryProviderType; import org.eclipse.team.core.diff.IDiff; import org.eclipse.team.core.subscribers.*; @@ -92,7 +91,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS } private int getSynchronizationState(ResourceMapping mapping, int stateMask, IProgressMonitor monitor) throws CoreException { - ISynchronizationCompareAdapter compareAdapter = (ISynchronizationCompareAdapter)Utils.getAdapter(mapping.getModelProvider(), ISynchronizationCompareAdapter.class); + ISynchronizationCompareAdapter compareAdapter = (ISynchronizationCompareAdapter)Adapters.adapt(mapping.getModelProvider(), ISynchronizationCompareAdapter.class); try { if (compareAdapter != null) { int state = compareAdapter.getSynchronizationState(this, mapping, stateMask, monitor); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java index aa6fa1e80..745ef3141 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java @@ -17,6 +17,7 @@ import org.eclipse.compare.IContentChangeNotifier; import org.eclipse.compare.structuremergeviewer.ICompareInput; import org.eclipse.core.resources.mapping.ModelProvider; import org.eclipse.core.resources.mapping.ResourceMapping; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.ToolBarManager; @@ -25,7 +26,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.*; import org.eclipse.team.core.mapping.IMergeContext; import org.eclipse.team.internal.ui.Policy; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.PageSaveablePart; import org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter; import org.eclipse.team.ui.mapping.ISynchronizationCompareInput; @@ -109,7 +109,7 @@ public class NonSyncMergePart extends PageSaveablePart { * Convert the compare input to a synchronize compare input. */ private ISynchronizationCompareInput asSynchronizationCompareInput(ICompareInput input) { - return (ISynchronizationCompareInput)Utils.getAdapter(input, ISynchronizationCompareInput.class); + return (ISynchronizationCompareInput)Adapters.adapt(input, ISynchronizationCompareInput.class); } public void contentChanged(IContentChangeNotifier source) { diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java index bddb2a1bf..106a45be5 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java @@ -14,6 +14,7 @@ import java.io.ByteArrayInputStream; import java.util.Iterator; import org.eclipse.core.resources.*; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.jface.action.Action; @@ -25,7 +26,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; import org.eclipse.team.examples.model.*; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.navigator.*; /** @@ -164,7 +164,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { private ModelSaveablesProvider getSaveablesProvider() { ITreeContentProvider provider = getActionSite().getContentService().getContentExtensionById("org.eclipse.team.examples.model.navigator").getContentProvider(); - return (ModelSaveablesProvider)Utils.getAdapter(provider, SaveablesProvider.class); + return (ModelSaveablesProvider)Adapters.adapt(provider, SaveablesProvider.class); } }; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java index 6131153a5..622e42cc8 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java @@ -11,11 +11,11 @@ package org.eclipse.team.examples.model.ui; import org.eclipse.core.resources.mapping.ResourceMapping; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.team.examples.model.ModelObject; import org.eclipse.team.examples.model.ModelObjectDefinitionFile; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.ui.Saveable; /** @@ -75,7 +75,7 @@ public class ModelSaveable extends Saveable { public Object getAdapter(Class adapter) { if (adapter == ResourceMapping.class) { - return Utils.getAdapter(getModelObject(), ResourceMapping.class); + return Adapters.adapt(getModelObject(), ResourceMapping.class); } return super.getAdapter(adapter); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java index 18f511c45..277d308f1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java @@ -16,6 +16,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.team.core.history.IFileRevision; @@ -56,11 +57,11 @@ public class EditorTests extends EclipseTest { ICVSRemoteFile remoteFile = (ICVSRemoteFile)CVSWorkspaceRoot.getRemoteResourceFor(project.getFile("file.cvsTest")); IEditorPart part = CVSUIPlugin.getPlugin().openEditor(remoteFile, new NullProgressMonitor()); assertTrue("The proper remote editor was not opened", !(part instanceof TestEditor) && (part instanceof ITextEditor)); - assertNotNull(Utils.getAdapter(part.getEditorInput(), IFileRevision.class)); - assertNotNull(Utils.getAdapter(part.getEditorInput(), ICVSFile.class)); - assertNotNull(Utils.getAdapter(part.getEditorInput(), IResourceVariant.class)); - assertNotNull(Utils.getAdapter(part.getEditorInput(), IHistoryPageSource.class)); - assertNotNull(Utils.getAdapter(part.getEditorInput(), IWorkbenchAdapter.class)); + assertNotNull(Adapters.adapt(part.getEditorInput(), IFileRevision.class)); + assertNotNull(Adapters.adapt(part.getEditorInput(), ICVSFile.class)); + assertNotNull(Adapters.adapt(part.getEditorInput(), IResourceVariant.class)); + assertNotNull(Adapters.adapt(part.getEditorInput(), IHistoryPageSource.class)); + assertNotNull(Adapters.adapt(part.getEditorInput(), IWorkbenchAdapter.class)); } } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java index 07d066702..2928d5fe3 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java @@ -13,13 +13,13 @@ package org.eclipse.team.tests.ccvs.ui; import junit.framework.AssertionFailedError; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Adapters; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.TeamException; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber; import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter; import org.eclipse.team.internal.ui.TeamUIPlugin; -import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.internal.ui.synchronize.SynchronizeView; import org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource; import org.eclipse.team.ui.TeamUI; @@ -47,7 +47,7 @@ public class ParticipantSyncInfoSource extends SyncInfoSource { } protected SyncInfoToDiffConverter getConverter(Subscriber subscriber) { - SyncInfoToDiffConverter converter = (SyncInfoToDiffConverter)Utils.getAdapter(subscriber, SyncInfoToDiffConverter.class); + SyncInfoToDiffConverter converter = (SyncInfoToDiffConverter)Adapters.adapt(subscriber, SyncInfoToDiffConverter.class); if (converter == null) converter = SyncInfoToDiffConverter.getDefault(); return converter; |