diff options
| author | Eike Stepper | 2015-01-29 06:23:54 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-02-18 14:39:34 +0000 |
| commit | 109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8 (patch) | |
| tree | d24313df4fbc8429e023a811ab7f6349aa5d43aa /plugins/org.eclipse.emf.cdo.admin | |
| parent | 579603209ec8450c8099bd48767687cb3229e529 (diff) | |
| download | cdo-109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8.tar.gz cdo-109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8.tar.xz cdo-109f40bb0afb1b6adf9a03e47ff37d3f3bd99bf8.zip | |
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.admin')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.admin/META-INF/MANIFEST.MF | 10 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientRepositoryImpl.java | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.admin/META-INF/MANIFEST.MF index d4750a057b..dbd9f48aee 100644 --- a/plugins/org.eclipse.emf.cdo.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.admin/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.admin; singleton:=true -Bundle-Version: 4.1.200.qualifier +Bundle-Version: 4.1.300.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,13 +11,13 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.admin;version="4.1.200", - org.eclipse.emf.cdo.internal.admin;version="4.1.200"; +Export-Package: org.eclipse.emf.cdo.admin;version="4.1.300", + org.eclipse.emf.cdo.internal.admin;version="4.1.300"; x-friends:="org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.defs, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.ui.admin, org.eclipse.emf.cdo.examples", - org.eclipse.emf.cdo.internal.admin.bundle;version="4.1.200";x-friends:="org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.admin.protocol;version="4.1.200";x-internal:=true + org.eclipse.emf.cdo.internal.admin.bundle;version="4.1.300";x-friends:="org.eclipse.emf.cdo.tests", + org.eclipse.emf.cdo.internal.admin.protocol;version="4.1.300";x-internal:=true Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientRepositoryImpl.java b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientRepositoryImpl.java index f688ff9afe..86041baa01 100644 --- a/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientRepositoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.admin/src/org/eclipse/emf/cdo/internal/admin/CDOAdminClientRepositoryImpl.java @@ -23,12 +23,12 @@ import org.eclipse.emf.cdo.net4j.CDONet4jUtil; import org.eclipse.emf.cdo.spi.common.protocol.CDODataInputImpl; import org.eclipse.net4j.connector.IConnector; +import org.eclipse.net4j.util.AdapterUtil; import org.eclipse.net4j.util.event.Notifier; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.om.monitor.NotifyingMonitor; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Platform; import java.io.IOException; import java.util.HashSet; @@ -209,9 +209,10 @@ public class CDOAdminClientRepositoryImpl extends Notifier implements CDOAdminCl return configuration.openNet4jSession(); } - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) + @SuppressWarnings({ "unchecked", "rawtypes" }) + public Object getAdapter(Class adapter) { - return Platform.getAdapterManager().getAdapter(this, adapter); + return AdapterUtil.adapt(this, adapter); } @Override |