Skip to content

Commit 4ec80e5

Browse files
eclipse-pde-botlaeubi
authored andcommitted
Perform clean code of apitools/org.eclipse.pde.api.tools.ui
1 parent 08ab283 commit 4ec80e5

20 files changed

+35
-71
lines changed

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiImageDescriptor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,10 @@ protected Point getSize() {
6161
*/
6262
@Override
6363
public boolean equals(Object object) {
64-
if (!(object instanceof ApiImageDescriptor)) {
64+
if (!(object instanceof ApiImageDescriptor other)) {
6565
return false;
6666
}
6767

68-
ApiImageDescriptor other = (ApiImageDescriptor) object;
6968
return (getBaseImage().equals(other.getBaseImage()) && getFlags() == other.getFlags());
7069
}
7170

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/ApiToolsLabelProvider.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,10 @@ public void dispose() {
6666

6767
@Override
6868
public Image getImage(Object element) {
69-
if (element instanceof IApiComponent) {
70-
IApiComponent comp = (IApiComponent) element;
69+
if (element instanceof IApiComponent comp) {
7170
return getApiComponentImage(comp);
7271
}
73-
if (element instanceof IResource) {
74-
IResource resource = (IResource) element;
72+
if (element instanceof IResource resource) {
7573
switch (resource.getType()) {
7674
case IResource.FILE:
7775
return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE);
@@ -92,8 +90,7 @@ public Image getImage(Object element) {
9290
if (element instanceof EEEntry) {
9391
return ApiUIPlugin.getSharedImage(IApiToolsConstants.IMG_OBJ_API_SYSTEM_LIBRARY);
9492
}
95-
if (element instanceof IApiProblemFilter) {
96-
IApiProblemFilter filter = (IApiProblemFilter) element;
93+
if (element instanceof IApiProblemFilter filter) {
9794
IApiProblem problem = filter.getUnderlyingProblem();
9895
/*
9996
* int flags = (problem.getSeverity() == ApiPlugin.SEVERITY_ERROR ?
@@ -193,8 +190,7 @@ private Image getApiComponentImage(IApiComponent component) {
193190

194191
@Override
195192
public String getText(Object element) {
196-
if (element instanceof IApiComponent) {
197-
IApiComponent comp = (IApiComponent) element;
193+
if (element instanceof IApiComponent comp) {
198194
return MessageFormat.format(Messages.ApiToolsLabelProvider_0, comp.getSymbolicName(), comp.getVersion());
199195
}
200196
if (element instanceof File) {
@@ -204,8 +200,7 @@ public String getText(Object element) {
204200
return ((File) element).getName();
205201
}
206202
}
207-
if (element instanceof IApiBaseline) {
208-
IApiBaseline baseline = (IApiBaseline) element;
203+
if (element instanceof IApiBaseline baseline) {
209204
StringBuilder buffer = new StringBuilder();
210205
buffer.append(baseline.getName());
211206
if (isDefaultBaseline(baseline)) {
@@ -216,12 +211,10 @@ public String getText(Object element) {
216211
if (element instanceof EEEntry) {
217212
return ((EEEntry) element).toString();
218213
}
219-
if (element instanceof IApiProblemFilter) {
220-
IApiProblemFilter filter = (IApiProblemFilter) element;
214+
if (element instanceof IApiProblemFilter filter) {
221215
return filter.getUnderlyingProblem().getMessage();
222216
}
223-
if (element instanceof IResource) {
224-
IResource resource = (IResource) element;
217+
if (element instanceof IResource resource) {
225218
IPath path = resource.getProjectRelativePath();
226219
StringBuilder buffer = new StringBuilder();
227220
buffer.append(path.removeFileExtension().lastSegment());
@@ -243,8 +236,7 @@ public String getText(Object element) {
243236
* @return if the profile is the default or not
244237
*/
245238
protected boolean isDefaultBaseline(Object element) {
246-
if (element instanceof IApiBaseline) {
247-
IApiBaseline profile = (IApiBaseline) element;
239+
if (element instanceof IApiBaseline profile) {
248240
IApiBaseline def = ApiPlugin.getDefault().getApiBaselineManager().getDefaultApiBaseline();
249241
if (def != null) {
250242
return profile.getName().equals(def.getName());

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/CompositeApiImageDescriptor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ protected Point getSize() {
9292

9393
@Override
9494
public boolean equals(Object obj) {
95-
if (obj instanceof CompositeApiImageDescriptor) {
96-
CompositeApiImageDescriptor other = (CompositeApiImageDescriptor) obj;
95+
if (obj instanceof CompositeApiImageDescriptor other) {
9796
return (fOriginalImage.equals(other.fOriginalImage) && fFlags == other.fFlags);
9897
}
9998
return false;

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/JavaElementActionFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ public class JavaElementActionFilter implements IActionFilter {
2828
@Override
2929
public boolean testAttribute(Object target, String name, String value) {
3030
if (name.equals("JavaElementActionFilter")) { //$NON-NLS-1$
31-
if (target instanceof IJavaElement) {
32-
IJavaElement javaElement = (IJavaElement) target;
31+
if (target instanceof IJavaElement javaElement) {
3332
if (value.equals("isEnabled")) { //$NON-NLS-1$
3433
while (javaElement != null) {
3534
switch (javaElement.getElementType()) {

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/CompareWithAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
4141
*/
4242
@Override
4343
public void run(IAction action) {
44-
if (this.selection instanceof IStructuredSelection) {
45-
final IStructuredSelection structuredSelection = (IStructuredSelection) this.selection;
44+
if (this.selection instanceof final IStructuredSelection structuredSelection) {
4645
CompareToBaselineWizard wizard = new CompareToBaselineWizard(structuredSelection, ActionMessages.CompareDialogTitle);
4746
WizardDialog wdialog = new WizardDialog(workbenchPartSite.getShell(), wizard);
4847
wdialog.open();

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/actions/TreeViewerNavigator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.eclipse.jface.viewers.ISelection;
1717
import org.eclipse.jface.viewers.StructuredSelection;
1818
import org.eclipse.jface.viewers.TreeViewer;
19-
import org.eclipse.pde.api.tools.ui.internal.actions.DeltaSession.TreeNode;
2019
import org.eclipse.swt.widgets.Tree;
2120
import org.eclipse.swt.widgets.TreeItem;
2221

@@ -187,8 +186,7 @@ private TreeItem[] getSiblings(TreeItem currentItem) {
187186

188187
private boolean hasMatches(TreeItem item) {
189188
Object element = item.getData();
190-
if (element instanceof DeltaSession.TreeNode) {
191-
TreeNode node = (TreeNode) element;
189+
if (element instanceof DeltaSession.TreeNode node) {
192190
return node.getData() != null && !node.hasChildren();
193191
}
194192
return element != null;

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/commands/CompareToBaselineHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ public class CompareToBaselineHandler extends AbstractHandler {
3333
@Override
3434
public Object execute(ExecutionEvent event) throws ExecutionException {
3535
ISelection selection = HandlerUtil.getCurrentSelectionChecked(event);
36-
if (selection instanceof IStructuredSelection) {
37-
final IStructuredSelection structuredSelection = (IStructuredSelection) selection;
36+
if (selection instanceof final IStructuredSelection structuredSelection) {
3837
CompareToBaselineWizard wizard = new CompareToBaselineWizard(structuredSelection, ActionMessages.CompareDialogTitle);
3938
WizardDialog wdialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
4039
wdialog.open();

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/commands/RemoveFiltersHandler.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
4949
* @return the {@link IAdaptable} for the current selection context
5050
*/
5151
private IAdaptable getAdaptable(ISelection selection) {
52-
if (selection instanceof IStructuredSelection) {
53-
IStructuredSelection ss = (IStructuredSelection) selection;
52+
if (selection instanceof IStructuredSelection ss) {
5453
Object o = ss.getFirstElement();
55-
if (o instanceof IAdaptable) {
56-
IAdaptable adapt = (IAdaptable) o;
54+
if (o instanceof IAdaptable adapt) {
5755
IResource resource = adapt.getAdapter(IResource.class);
5856
if (resource != null) {
5957
return (resource instanceof IProject ? resource : resource.getProject());

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/completion/APIToolsJavadocCompletionProposalComputer.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,7 @@ private int getType(IJavaElement element) throws JavaModelException {
293293
while (lelement != null && lelement.getElementType() != IJavaElement.TYPE) {
294294
lelement = lelement.getParent();
295295
}
296-
if (lelement instanceof IType) {
297-
IType type = (IType) lelement;
296+
if (lelement instanceof IType type) {
298297
if (type.isAnnotation()) {
299298
return IApiJavadocTag.TYPE_ANNOTATION;
300299
} else if (type.isInterface()) {
@@ -311,8 +310,7 @@ private int getType(IJavaElement element) throws JavaModelException {
311310
* activated on
312311
*/
313312
private void collectExistingTags(IJavaElement element, JavaContentAssistInvocationContext jcontext) throws JavaModelException {
314-
if (element instanceof IMember) {
315-
IMember member = (IMember) element;
313+
if (element instanceof IMember member) {
316314
ICompilationUnit cunit = jcontext.getCompilationUnit();
317315
if (cunit != null) {
318316
if (cunit.isWorkingCopy()) {

apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/markers/UpdateBundleVersionOperation.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,12 @@ public IStatus run(IProgressMonitor monitor) {
6363
ModelModification mod = new ModelModification(file) {
6464
@Override
6565
protected void modifyModel(IBaseModel model, IProgressMonitor monitor) throws CoreException {
66-
if (!(model instanceof IBundlePluginModelBase)) {
66+
if (!(model instanceof IBundlePluginModelBase modelBase)) {
6767
return;
6868
}
69-
IBundlePluginModelBase modelBase = (IBundlePluginModelBase) model;
7069
IBundle bundle = modelBase.getBundleModel().getBundle();
7170
IManifestHeader header = bundle.getManifestHeader(Constants.BUNDLE_VERSION);
72-
if (header instanceof BundleVersionHeader) {
73-
BundleVersionHeader versionHeader = (BundleVersionHeader) header;
71+
if (header instanceof BundleVersionHeader versionHeader) {
7472
versionHeader.setValue(fVersion);
7573
}
7674
}

0 commit comments

Comments
 (0)