diff options
author | Alexander Kurtakov | 2017-10-16 19:24:51 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2017-10-16 19:24:51 +0000 |
commit | 8d739c0ba5a0fdcf18927d7eec2d2e732e673c39 (patch) | |
tree | 6c8b5e1a3c950c4dde681e0db70ce820591c01b9 | |
parent | ca8e5dacb615ebc9275d2205e586e4496bfc0a5a (diff) | |
download | eclipse.pde.ui-8d739c0ba5a0fdcf18927d7eec2d2e732e673c39.tar.gz eclipse.pde.ui-8d739c0ba5a0fdcf18927d7eec2d2e732e673c39.tar.xz eclipse.pde.ui-8d739c0ba5a0fdcf18927d7eec2d2e732e673c39.zip |
Bug 526104 - Generify RegistryBrowser getAdapterI20171017-2000I20171017-0515
And remove cast.
Change-Id: Ib63f3828518e44d5b26d67d3fd8c53cb28fc4cb1
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java index 4fc20f8eda..ecf9589db5 100644 --- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java +++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowser.java @@ -778,13 +778,13 @@ public class RegistryBrowser extends ViewPart { } @Override - public Object getAdapter(Class clazz) { + public <T> T getAdapter(Class<T> clazz) { if (ILabelProvider.class.equals(clazz)) { - return fLabelProvider; + return clazz.cast(fLabelProvider); } if (IContentProvider.class.equals(clazz)) { - return fContentProvider; + return clazz.cast(fContentProvider); } return super.getAdapter(clazz); diff --git a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java index 4ed6cb9729..f290f944bb 100644 --- a/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java +++ b/ui/org.eclipse.pde.runtime/src/org/eclipse/pde/internal/runtime/registry/RegistryBrowserContentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2017 IBM Corporation 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 @@ -101,7 +101,7 @@ public class RegistryBrowserContentProvider implements ITreeContentProvider { ModelObject[] objs = folder.getChildren(); if (folder.getId() == Folder.F_USING_BUNDLES) { ModelObject[] result = new ModelObject[objs.length]; - ILabelProvider labelProvider = (ILabelProvider) fRegistryBrowser.getAdapter(ILabelProvider.class); + ILabelProvider labelProvider = fRegistryBrowser.getAdapter(ILabelProvider.class); for (int i = 0; i < objs.length; i++) { result[i] = new Attribute(Attribute.F_BUNDLE, labelProvider.getText(objs[i])); |