From 7c8b2459d5521a498c37cd1bb59ef5fd50e28d36 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 15 Apr 2015 13:35:39 -0400 Subject: [PATCH] Move to new getAdapter() signature using generics Signed-off-by: Marc Khouzam --- .../command/commands/TestMIBreakInsertCommand.java | 5 ++--- .../commands/TestMICommandConstructCommand.java | 5 ++--- .../internal/ui/console/ConsolePageParticipant.java | 3 +-- .../gdb/service/GDBPatternMatchingExpressions.java | 3 +-- .../breakpoint/actions/BreakpointActionAdapter.java | 12 ++++++------ 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java index 4c6f1743243..bdc56f53f82 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMIBreakInsertCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2014 Ericsson and others. + * Copyright (c) 2008, 2015 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -58,8 +58,7 @@ public class TestMIBreakInsertCommand { } @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java index 32b9a77c9ca..babb40eb1c8 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/mi/service/command/commands/TestMICommandConstructCommand.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2014 Ericsson and others. + * Copyright (c) 2008, 2015 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -70,8 +70,7 @@ public class TestMICommandConstructCommand { } @Override - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java index 6f284359576..b61d8cbd483 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/console/ConsolePageParticipant.java @@ -98,9 +98,8 @@ public class ConsolePageParticipant implements IConsolePageParticipant, IDebugCo return false; } - @SuppressWarnings("rawtypes") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java index 74fe922ae22..fa9f46f0c08 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBPatternMatchingExpressions.java @@ -127,9 +127,8 @@ public class GDBPatternMatchingExpressions extends AbstractDsfService implements return fExprDelegate.getParents(); }; - @SuppressWarnings("rawtypes") @Override - public Object getAdapter(Class adapterType) { + public T getAdapter(Class adapterType) { return fExprDelegate.getAdapter(adapterType); } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/BreakpointActionAdapter.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/BreakpointActionAdapter.java index 65776609cee..ff9ef38922a 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/BreakpointActionAdapter.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/breakpoint/actions/BreakpointActionAdapter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Ericsson and others. + * Copyright (c) 2008, 2015 Ericsson and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,17 +35,17 @@ public class BreakpointActionAdapter implements IAdaptable { fContext = context; } - @SuppressWarnings("rawtypes") + @SuppressWarnings("unchecked") @Override - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter.equals(ILogActionEnabler.class)) { - return new MILogActionEnabler(fExecutor, fServiceTracker, fContext); + return (T)new MILogActionEnabler(fExecutor, fServiceTracker, fContext); } if (adapter.equals(IResumeActionEnabler.class)) { - return new MIResumeActionEnabler(fExecutor, fServiceTracker, fContext); + return (T)new MIResumeActionEnabler(fExecutor, fServiceTracker, fContext); } if (adapter.equals(IReverseDebugEnabler.class)) { - return new MIReverseDebugEnabler(fExecutor, fServiceTracker, fContext); + return (T)new MIReverseDebugEnabler(fExecutor, fServiceTracker, fContext); } return null; }