From 3f8305fc0fb9e54dca63f4d8d35521789ccc1d68 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Wed, 15 Apr 2015 14:05:52 -0400 Subject: [PATCH] Move to new getAdapter() signature using generics Signed-off-by: Marc Khouzam --- .../cdt/tests/dsf/gdb/tests/MIRegistersTest.java | 2 +- .../src/org/eclipse/cdt/tests/dsf/vm/TestModel.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java index 5d7010072a7..f24ea78475f 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java @@ -634,7 +634,7 @@ public class MIRegistersTest extends BaseTestCase { } @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { + public T getAdapter(Class adapter) { return null; } }; diff --git a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java index 9d5dac702db..a28d96a57b3 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/vm/TestModel.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Wind River Systems and others. + * Copyright (c) 2009, 2015 Wind River Systems 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 @@ -31,7 +31,9 @@ import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationCont import org.eclipse.debug.internal.ui.viewers.model.provisional.ITreeModelViewer; import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta; import org.eclipse.jface.viewers.TreePath; + import static org.junit.Assert.*; + import org.osgi.framework.BundleContext; /** @@ -93,11 +95,11 @@ public class TestModel extends AbstractDsfService implements IFormattedValues { return fModel; } - @SuppressWarnings("rawtypes") - @Override - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + @Override + public T getAdapter(Class adapter) { if (adapter.isInstance(fModel)) { - return fModel; + return (T)fModel; } return null; }