Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-03-24 09:50:35 +0000
committerEike Stepper2015-03-24 09:50:35 +0000
commit20582a73ebe7c16c9b3a5621e5dbd4c80f2f6d46 (patch)
tree719a0ecfec4b5974e824adf325443b8934231833 /plugins/org.eclipse.emf.cdo.ui
parentdbc9cff6f1b9638fb4afb0c707cc19156483c6ca (diff)
downloadcdo-20582a73ebe7c16c9b3a5621e5dbd4c80f2f6d46.tar.gz
cdo-20582a73ebe7c16c9b3a5621e5dbd4c80f2f6d46.tar.xz
cdo-20582a73ebe7c16c9b3a5621e5dbd4c80f2f6d46.zip
[Releng] Adjust to generification of getAdapter()
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/component.ext3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java5
4 files changed, 11 insertions, 11 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/component.ext b/plugins/org.eclipse.emf.cdo.ui/component.ext
index dccd5f1aa9..fd6a1bf959 100644
--- a/plugins/org.eclipse.emf.cdo.ui/component.ext
+++ b/plugins/org.eclipse.emf.cdo.ui/component.ext
@@ -6,6 +6,5 @@
xmlns:targlets="http://www.eclipse.org/oomph/targlets/1.0"
xsi:schemaLocation="http://www.eclipse.org/oomph/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Targlets.ecore">
<requirement
- name="org.eclipse.emf.ecp.view.model.provider.generator"
- optional="true"/>
+ name="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group"/>
</targlets:ComponentExtension>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index 030f4fe7fe..f948d06d7f 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -1544,17 +1544,17 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings("unchecked")
@Override
- public Object getAdapter(Class key)
+ public <T> T getAdapter(Class<T> key)
{
if (key.equals(IContentOutlinePage.class))
{
- return showOutlineView() ? getContentOutlinePage() : null;
+ return (T)(showOutlineView() ? getContentOutlinePage() : null);
}
else if (key.equals(IPropertySheetPage.class))
{
- return getPropertySheetPage();
+ return (T)getPropertySheetPage();
}
else
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
index 1d7fb3273e..f8183d5bf9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java
@@ -288,13 +288,13 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider
}
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings("unchecked")
@Override
- public Object getAdapter(Class adapter)
+ public <T> T getAdapter(Class<T> adapter)
{
if (adapter.equals(IPropertySheetPage.class))
{
- return getPropertySheetPage();
+ return (T)getPropertySheetPage();
}
return super.getAdapter(adapter);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java
index 0f27ef4179..6ff9c39293 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java
@@ -144,12 +144,13 @@ public final class CDOEditorUtil
return editingDomain;
}
+ @SuppressWarnings("unchecked")
@Override
- public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter)
+ public <T> T getAdapter(Class<T> adapter)
{
if (adapter == IEditingDomainProvider.class)
{
- return this;
+ return (T)this;
}
return super.getAdapter(adapter);

Back to the top