Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Prigogin2016-08-24 11:53:18 +0000
committerSergey Prigogin2016-08-24 11:53:18 +0000
commit610d92f8ebc9c90b9edbd289596a1681a92f1913 (patch)
treed672742994b2a3b2dd6fbfc38ac287f01a3fe442 /examples
parent197e7f029ecc8b5217ce226bac3b4379df49c115 (diff)
downloadeclipse.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
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java4
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java4
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java4
3 files changed, 6 insertions, 6 deletions
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);
}

Back to the top