From 20582a73ebe7c16c9b3a5621e5dbd4c80f2f6d46 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Tue, 24 Mar 2015 10:50:35 +0100 Subject: [Releng] Adjust to generification of getAdapter() --- .../META-INF/MANIFEST.MF | 4 ++-- .../presentation/DawngenmodelEditor.java | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../presentation/DawnEmfGenmodelEditor.java | 2 +- .../META-INF/MANIFEST.MF | 6 +++--- .../presentation/DawnGmfGenmodelEditor.java | 2 +- .../META-INF/MANIFEST.MF | 22 +++++++++++----------- .../gmf/editors/impl/DawnGMFEditorSupport.java | 9 +++++---- .../ui/checkouts/actions/NewActionProvider.java | 2 +- .../ui/properties/ExplorerUIAdapterFactory.java | 16 ++++++++-------- .../explorer/CDOExplorerAdapterFactory.java | 10 +++++----- .../META-INF/MANIFEST.MF | 2 +- .../presentation/ExpressionsEditor.java | 2 +- plugins/org.eclipse.emf.cdo.releng/CDO.setup | 6 +----- .../META-INF/MANIFEST.MF | 2 +- .../cdo/security/presentation/SecurityEditor.java | 4 ++-- .../ui/handlers/ManageSecurityHandler.java | 4 ++-- .../team/history/CDOHistoryAdapterFactory.java | 10 +++++----- plugins/org.eclipse.emf.cdo.ui/component.ext | 3 +-- .../emf/cdo/internal/ui/editor/CDOEditor.java | 8 ++++---- .../cdo/internal/ui/views/CDOWatchListView.java | 6 +++--- .../src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java | 5 +++-- .../util/ui/AbstractPropertyAdapterFactory.java | 12 ++++++------ .../eclipse/net4j/util/ui/views/ContainerView.java | 5 +++-- 24 files changed, 74 insertions(+), 76 deletions(-) (limited to 'plugins') diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF index 399f9ac0e0..4fdbae4b76 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor;singleton:=true -Bundle-Version: 2.0.200.qualifier +Bundle-Version: 2.0.300.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.presentation.DawnCodeGenEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor.registry;version="2.0.200", +Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor.registry;version="2.0.300", org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.presentation;version="2.0.0"; uses:="org.eclipse.jface.wizard, org.eclipse.core.runtime, diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java index 1bc2973847..bbbcbae556 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.editor/src/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/presentation/DawngenmodelEditor.java @@ -1143,7 +1143,7 @@ public class DawngenmodelEditor extends MultiPageEditorPart implements IEditingD * * @generated */ - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public Object getAdapter(Class key) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF index 0309604c72..7efa38a6ab 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.presentation.DawnGenModelEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.dawnEmfGenmodel.presentation;version="1.0.0", - org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.actions;version="1.0.200", - org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.creators;version="1.0.200" + org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.actions;version="1.0.300", + org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui.creators;version="1.0.300" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java index df987b4dd5..923f15926e 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.emf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/emf/dawnEmfGenmodel/presentation/DawnEmfGenmodelEditor.java @@ -1087,7 +1087,7 @@ public class DawnEmfGenmodelEditor extends MultiPageEditorPart implements IEditi * * @generated */ - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public Object getAdapter(Class key) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF index 5195912ce4..c74bf233bd 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui;singleton:=true -Bundle-Version: 1.0.200.qualifier +Bundle-Version: 1.0.300.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation.DawnCodeGenEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.dawnGmfGenmodel.presentation;version="1.0.0", - org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.actions;version="1.0.200", - org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.creators;version="1.0.200" + org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.actions;version="1.0.300", + org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui.creators;version="1.0.300" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java index 8586807bec..16f1a77304 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.codegen.dawngenmodel.gmf.ui/src-gen/org/eclipse/emf/cdo/dawn/codegen/dawngenmodel/gmf/dawnGmfGenmodel/presentation/DawnGmfGenmodelEditor.java @@ -1089,7 +1089,7 @@ public class DawnGmfGenmodelEditor extends MultiPageEditorPart implements IEditi * * @generated */ - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public Object getAdapter(Class key) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF index 27f109307a..0e969b0cb3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.gmf;singleton:=true -Bundle-Version: 2.1.100.qualifier +Bundle-Version: 2.1.200.qualifier Bundle-Activator: org.eclipse.emf.cdo.dawn.gmf.Activator Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", @@ -23,15 +23,15 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %providerName -Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.resources;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.1.100", - org.eclipse.emf.cdo.dawn.gmf.util;version="2.1.100", +Export-Package: org.eclipse.emf.cdo.dawn.gmf;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.appearance;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.appearance.impl;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.editors.impl;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.elementtypes;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.notifications.impl;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.resources;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.stylizer;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.synchronize;version="2.1.200", + org.eclipse.emf.cdo.dawn.gmf.util;version="2.1.200", org.eclipse.emf.cdo.dawn.transaction;version="2.1.0" Bundle-Localization: plugin diff --git a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java index c0c733b3f0..c79d2dd4ad 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java +++ b/plugins/org.eclipse.emf.cdo.dawn.gmf/src/org/eclipse/emf/cdo/dawn/gmf/editors/impl/DawnGMFEditorSupport.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Martin Fluegge - initial API and implementation * Christian W. Damus (CEA) - bug 399285 support IDawnEditor adapters @@ -71,7 +71,7 @@ public class DawnGMFEditorSupport extends DawnAbstractEditorSupport *

* Note that this method is called in the constructor, so subclasses must * be aware that {@code this} has not been fully initialized. - * + * * @since 2.1 */ protected DawnGMFHandler createDawnGMFHandler(IDawnEditor editor) @@ -116,7 +116,7 @@ public class DawnGMFEditorSupport extends DawnAbstractEditorSupport * {@code editor} is a {@link DiagramDocumentEditor}, then that is returned as * is. Otherwise, try to get an {@code DiagramDocumentEditor} * {@linkplain IAdaptable#getAdapter(Class) adapter} from the {@code editor}. - * + * * @param editor the Dawn editor from which to get the GMF editor * @since 2.1 */ @@ -126,7 +126,8 @@ public class DawnGMFEditorSupport extends DawnAbstractEditorSupport { return (DiagramDocumentEditor)editor; } - return (DiagramDocumentEditor)editor.getAdapter(DiagramDocumentEditor.class); + + return editor.getAdapter(DiagramDocumentEditor.class); } public void refresh() diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java index 7f4d297160..41edeb965b 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java @@ -362,7 +362,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio return delegate.getLabel(); } - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) + public T getAdapter(Class adapter) { return delegate.getAdapter(adapter); } diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerUIAdapterFactory.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerUIAdapterFactory.java index 316bbc461a..3d7aa8b94c 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerUIAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/properties/ExplorerUIAdapterFactory.java @@ -40,42 +40,42 @@ import org.eclipse.core.runtime.jobs.Job; /** * @since 4.4 */ -@SuppressWarnings("rawtypes") public class ExplorerUIAdapterFactory implements IAdapterFactory { private static final Class CLASS_EXPLORER_RENAME_CONTEXT = CDORenameContext.class; private static final Class CLASS_STATE_PROVIDER = StateProvider.class; - private static final Class[] CLASSES = { CLASS_EXPLORER_RENAME_CONTEXT, CLASS_STATE_PROVIDER }; + private static final Class[] CLASSES = { CLASS_EXPLORER_RENAME_CONTEXT, CLASS_STATE_PROVIDER }; public ExplorerUIAdapterFactory() { } - public Class[] getAdapterList() + public Class[] getAdapterList() { return CLASSES; } - public Object getAdapter(Object adaptableObject, Class adapterType) + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (adapterType == CLASS_EXPLORER_RENAME_CONTEXT) { if (adaptableObject instanceof AbstractElement) { AbstractElement element = (AbstractElement)adaptableObject; - return createRenameContext(element); + return (T)createRenameContext(element); } else if (adaptableObject instanceof CDOBranch) { CDOBranch branch = (CDOBranch)adaptableObject; - return createRenameContext(branch); + return (T)createRenameContext(branch); } else if (adaptableObject instanceof CDOResourceNode) { CDOResourceNode resourceNode = (CDOResourceNode)adaptableObject; - return createRenameContext(resourceNode); + return (T)createRenameContext(resourceNode); } } else if (adapterType == CLASS_STATE_PROVIDER) @@ -86,7 +86,7 @@ public class ExplorerUIAdapterFactory implements IAdapterFactory CDOCheckout checkout = CDOExplorerUtil.getCheckout(eObject); if (checkout != null) { - return checkout; + return (T)checkout; } } } diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java index beeb914f9d..ca53f82505 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/CDOExplorerAdapterFactory.java @@ -25,23 +25,23 @@ import org.eclipse.core.runtime.IAdapterFactory; /** * @since 4.4 */ -@SuppressWarnings("rawtypes") public class CDOExplorerAdapterFactory implements IAdapterFactory { private static final Class CLASS_CDOREPOSITORYELEMENT = CDORepositoryElement.class; - private static final Class[] CLASSES = { CLASS_CDOREPOSITORYELEMENT }; + private static final Class[] CLASSES = { CLASS_CDOREPOSITORYELEMENT }; public CDOExplorerAdapterFactory() { } - public Class[] getAdapterList() + public Class[] getAdapterList() { return CLASSES; } - public Object getAdapter(Object adaptableObject, Class adapterType) + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (adapterType == CLASS_CDOREPOSITORYELEMENT) { @@ -66,7 +66,7 @@ public class CDOExplorerAdapterFactory implements IAdapterFactory final CDORepository repository = repositoryManager.getRepository(repositoryInfo.getSession()); if (repository != null) { - return new CDORepositoryElement() + return (T)new CDORepositoryElement() { public CDORepository getRepository() { diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF index f175fe6b74..08ffc391d8 100644 --- a/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.expressions.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.expressions.editor;singleton:=true -Bundle-Version: 4.3.0.qualifier +Bundle-Version: 4.3.100.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.expressions.presentation.ExpressionsEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java index 5c1a280659..785659ebde 100644 --- a/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java +++ b/plugins/org.eclipse.emf.cdo.expressions.editor/src/org/eclipse/emf/cdo/expressions/presentation/ExpressionsEditor.java @@ -1133,7 +1133,7 @@ public class ExpressionsEditor extends MultiPageEditorPart implements IEditingDo * * @generated */ - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public Object getAdapter(Class key) { diff --git a/plugins/org.eclipse.emf.cdo.releng/CDO.setup b/plugins/org.eclipse.emf.cdo.releng/CDO.setup index c08ea1aa94..6f02082ed8 100644 --- a/plugins/org.eclipse.emf.cdo.releng/CDO.setup +++ b/plugins/org.eclipse.emf.cdo.releng/CDO.setup @@ -136,10 +136,6 @@ name="org.eclipse.emf.cdo.examples.master"/> - - + url="http://download.eclipse.org/ecp/rt/150_MS3"/> * @generated */ - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public Object getAdapter(Class key) { @@ -1444,7 +1444,7 @@ public class SecurityEditor extends MultiPageEditorPart implements IEditingDomai */ protected void doSaveAs(URI uri, IEditorInput editorInput) { - (editingDomain.getResourceSet().getResources().get(0)).setURI(uri); + editingDomain.getResourceSet().getResources().get(0).setURI(uri); setInputWithNotify(editorInput); setPartName(editorInput.getName()); IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars() diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java index 232a8a1ad7..ae88b5830c 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java @@ -212,7 +212,7 @@ public class ManageSecurityHandler extends LongRunningHandler IWorkbenchPart part = HandlerUtil.getActivePart(event); if (part != null) { - result = (ISecurityManagementContext)part.getAdapter(ISecurityManagementContext.class); + result = part.getAdapter(ISecurityManagementContext.class); } if (result == null) @@ -280,7 +280,7 @@ public class ManageSecurityHandler extends LongRunningHandler /** * A specialized handler that gets or creates a session in the context of a repository in the * CDO Administration view. - * + * * @author Christian W. Damus (CEA LIST) */ public static class Sessionless extends ManageSecurityHandler implements CDOAdminClientRepository.SessionConfigurator diff --git a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java index aa286491f7..7a62b1b96a 100644 --- a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/history/CDOHistoryAdapterFactory.java @@ -16,27 +16,27 @@ import org.eclipse.team.ui.history.IHistoryPageSource; /** * @author Eike Stepper */ -@SuppressWarnings("rawtypes") public class CDOHistoryAdapterFactory implements IAdapterFactory { private static final Class CLASS_IHISTORYPAGESOURCE = IHistoryPageSource.class; - private static final Class[] ADAPTER_TYPES = { CLASS_IHISTORYPAGESOURCE }; + private static final Class[] ADAPTER_TYPES = { CLASS_IHISTORYPAGESOURCE }; public CDOHistoryAdapterFactory() { } - public Class[] getAdapterList() + public Class[] getAdapterList() { return ADAPTER_TYPES; } - public Object getAdapter(Object adaptableObject, Class adapterType) + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (adapterType == CLASS_IHISTORYPAGESOURCE) { - return CDOHistoryPageSource.INSTANCE; + return (T)CDOHistoryPageSource.INSTANCE; } return null; 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"> + name="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group"/> 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 * * @generated */ - @SuppressWarnings("rawtypes") + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class key) + public T getAdapter(Class 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 getAdapter(Class 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 getAdapter(Class adapter) { if (adapter == IEditingDomainProvider.class) { - return this; + return (T)this; } return super.getAdapter(adapter); diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java index 7132d44b5f..2f520bf985 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/AbstractPropertyAdapterFactory.java @@ -19,32 +19,32 @@ import org.eclipse.ui.views.properties.IPropertySourceProvider; * @author Eike Stepper * @since 3.2 */ -@SuppressWarnings("rawtypes") public abstract class AbstractPropertyAdapterFactory implements IAdapterFactory { private static final Class CLASS_IPROPERTYSOURCEPROVIDER = IPropertySourceProvider.class; private static final Class CLASS_IACTIONFILTER = IActionFilter.class; - private static final Class[] CLASSES = { CLASS_IPROPERTYSOURCEPROVIDER, CLASS_IACTIONFILTER }; + private static final Class[] CLASSES = { CLASS_IPROPERTYSOURCEPROVIDER, CLASS_IACTIONFILTER }; public AbstractPropertyAdapterFactory() { } - public Class[] getAdapterList() + public Class[] getAdapterList() { return CLASSES; } - public Object getAdapter(Object adaptableObject, Class adapterType) + @SuppressWarnings("unchecked") + public T getAdapter(Object adaptableObject, Class adapterType) { if (adapterType == CLASS_IPROPERTYSOURCEPROVIDER) { final IPropertySource propertySource = createPropertySource(adaptableObject); if (propertySource != null) { - return new IPropertySourceProvider() + return (T)new IPropertySourceProvider() { public IPropertySource getPropertySource(Object object) { @@ -56,7 +56,7 @@ public abstract class AbstractPropertyAdapterFactory implements IAdapterFactory if (adapterType == CLASS_IACTIONFILTER) { - return createActionFilter(adaptableObject); + return (T)createActionFilter(adaptableObject); } return null; diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java index d3f71ff58b..d61e673006 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java @@ -586,7 +586,8 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid } @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) + @SuppressWarnings("unchecked") + public T getAdapter(Class adapter) { if (adapter == IPropertySheetPage.class) { @@ -595,7 +596,7 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid propertySheetPage = new PropertySheetPage(); } - return propertySheetPage; + return (T)propertySheetPage; } return super.getAdapter(adapter); -- cgit v1.2.3