Bug 491036 - Eliminate Utils.getAdapter(Object, Class) in favor of

Adapters.adapt

Change-Id: I710ccfa96a6e3c6c329a57197273d2db524f0098

12 files changed, 25 insertions, 29 deletions

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);