Skip to content

Commit 93a1fc5

Browse files
eclipse-pde-botlaeubi
eclipse-pde-bot
authored and
laeubi
committed
Perform clean code of ui/org.eclipse.pde.bnd.ui
1 parent f69e351 commit 93a1fc5

File tree

10 files changed

+30
-64
lines changed

10 files changed

+30
-64
lines changed

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/RepositoryUtils.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ public static List<RepositoryPlugin> listRepositories(final Workspace localWorks
8282
}
8383

8484
for (RepositoryPlugin repo : repos) {
85-
if (repo instanceof RegistryPlugin) {
86-
RegistryPlugin registry = (RegistryPlugin) repo;
85+
if (repo instanceof RegistryPlugin registry) {
8786
registry.setRegistry(localWorkspace);
8887
}
8988
}

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/SelectionDragAdapter.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,15 @@ public void dragSetData(DragSourceEvent event) {
5454
Iterator<?> iterator = ((IStructuredSelection) selection).iterator();
5555
while (iterator.hasNext()) {
5656
Object item = iterator.next();
57-
if (item instanceof RepositoryBundle) {
58-
RepositoryBundle rb = (RepositoryBundle) item;
57+
if (item instanceof RepositoryBundle rb) {
5958
event.data = rb.getResource()
6059
.toString();
6160
break;
62-
} else if (item instanceof RepositoryBundleVersion) {
63-
RepositoryBundleVersion rbv = (RepositoryBundleVersion) item;
61+
} else if (item instanceof RepositoryBundleVersion rbv) {
6462
event.data = rbv.getResource()
6563
.toString();
6664
break;
67-
} else if (item instanceof RepositoryResourceElement) {
68-
RepositoryResourceElement rbe = (RepositoryResourceElement) item;
65+
} else if (item instanceof RepositoryResourceElement rbe) {
6966
event.data = rbe.getResource()
7067
.toString();
7168
break;

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/dnd/GAVDropTargetListener.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,13 @@ public void drop(DropTargetEvent event) {
113113
Iterator<?> iterator = ((IStructuredSelection) selection).iterator();
114114
while (iterator.hasNext()) {
115115
Object item = iterator.next();
116-
if (item instanceof RepositoryBundle) {
117-
RepositoryBundle rb = (RepositoryBundle) item;
116+
if (item instanceof RepositoryBundle rb) {
118117
format(new FormatEvent(rb.getResource(), rb.getRepo(), true, isAlternateSyntaxEnabled()));
119118
break;
120-
} else if (item instanceof RepositoryBundleVersion) {
121-
RepositoryBundleVersion rbv = (RepositoryBundleVersion) item;
119+
} else if (item instanceof RepositoryBundleVersion rbv) {
122120
format(new FormatEvent(rbv.getResource(), rbv.getRepo(), false, isAlternateSyntaxEnabled()));
123121
break;
124-
} else if (item instanceof RepositoryResourceElement) {
125-
RepositoryResourceElement rbe = (RepositoryResourceElement) item;
122+
} else if (item instanceof RepositoryResourceElement rbe) {
126123
RepositoryBundleVersion rbv = rbe.getRepositoryBundleVersion();
127124
format(new FormatEvent(rbv.getResource(), rbv.getRepo(), true, isAlternateSyntaxEnabled()));
128125
break;

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/dnd/GAVIPageListener.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,13 @@ public void partOpened(IWorkbenchPart part) {
5555

5656
IPath file = null;
5757

58-
if (part instanceof EditorPart) {
59-
EditorPart editorPart = (EditorPart) part;
60-
58+
if (part instanceof EditorPart editorPart) {
6159
IEditorInput editorInput = editorPart.getEditorInput();
6260

63-
if (editorInput instanceof IFileEditorInput) {
64-
IFileEditorInput input = (IFileEditorInput) editorInput;
65-
61+
if (editorInput instanceof IFileEditorInput input) {
6662
file = input.getFile()
6763
.getFullPath();
68-
} else if (editorInput instanceof IStorageEditorInput) {
69-
IStorageEditorInput input = (IStorageEditorInput) editorInput;
70-
64+
} else if (editorInput instanceof IStorageEditorInput input) {
7165
try {
7266
file = input.getStorage()
7367
.getFullPath();

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/repo/RepositoryEntry.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ public final File getFile(boolean forceDownload) {
158158
public Resource getResource() {
159159
RepositoryPlugin repositoryPlugin = getRepo();
160160
try {
161-
if (repositoryPlugin instanceof Repository) {
162-
Repository repository = (Repository) repositoryPlugin;
161+
if (repositoryPlugin instanceof Repository repository) {
163162
ExpressionCombiner combiner = repository.getExpressionCombiner();
164163

165164
RequirementBuilder identBuilder = new RequirementBuilder(IdentityNamespace.IDENTITY_NAMESPACE);

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/repo/RepositoryTreeContentProvider.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,11 @@ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
153153
public Object[] getChildren(Object parentElement) {
154154
Object[] result = null;
155155

156-
if (parentElement instanceof RepositoryPlugin) {
157-
RepositoryPlugin repo = (RepositoryPlugin) parentElement;
156+
if (parentElement instanceof RepositoryPlugin repo) {
158157
result = getRepositoryBundles(repo);
159-
} else if (parentElement instanceof RepositoryBundle) {
160-
RepositoryBundle bundle = (RepositoryBundle) parentElement;
158+
} else if (parentElement instanceof RepositoryBundle bundle) {
161159
result = getRepositoryBundleVersions(bundle);
162-
} else if (parentElement instanceof Project) {
163-
Project project = (Project) parentElement;
160+
} else if (parentElement instanceof Project project) {
164161
result = getProjectBundles(project);
165162
}
166163

@@ -195,8 +192,7 @@ private void addRepositoryPlugins(Collection<Object> result, Workspace workspace
195192
if (CACHE_REPOSITORY.equals(repoPlugin.getName())) {
196193
continue;
197194
}
198-
if (repoPlugin instanceof IndexProvider) {
199-
IndexProvider indexProvider = (IndexProvider) repoPlugin;
195+
if (repoPlugin instanceof IndexProvider indexProvider) {
200196
if (!supportsPhase(indexProvider)) {
201197
continue;
202198
}
@@ -211,8 +207,7 @@ private void addRepositoryPlugins(Collection<Object> result, Workspace workspace
211207

212208
private void addCollection(Collection<Object> result, Collection<Object> inputs) {
213209
for (Object input : inputs) {
214-
if (input instanceof RepositoryPlugin) {
215-
RepositoryPlugin repo = (RepositoryPlugin) input;
210+
if (input instanceof RepositoryPlugin repo) {
216211
if (repo instanceof IndexProvider) {
217212
if (!supportsPhase((IndexProvider) repo)) {
218213
continue;

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/model/repo/RepositoryTreeLabelProvider.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ public void update(ViewerCell cell) {
131131
}
132132
label.append(versionText, StyledString.COUNTER_STYLER);
133133
}
134-
} else if (element instanceof RepositoryResourceElement) {
135-
RepositoryResourceElement resourceElem = (RepositoryResourceElement) element;
136-
134+
} else if (element instanceof RepositoryResourceElement resourceElem) {
137135
label.append(resourceElem.getIdentity())
138136
.append(" ");
139137
label.append(resourceElem.getVersionString(), StyledString.COUNTER_STYLER);

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/quickfix/BuildpathQuickFixProcessor.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,7 @@ public IJavaCompletionProposal[] getCorrections(IInvocationContext context, IPro
463463
}
464464
case IProblem.IllegalCast : {
465465
ASTNode node = location.getCoveredNode(context.getASTRoot());
466-
if (node instanceof CastExpression) {
467-
CastExpression cast = (CastExpression) node;
466+
if (node instanceof CastExpression cast) {
468467
visitBindingHierarchy(cast.getType()
469468
.resolveBinding());
470469
}
@@ -606,8 +605,7 @@ public IJavaCompletionProposal[] getCorrections(IInvocationContext context, IPro
606605
addProposals(((Annotation) node).getTypeName());
607606
}
608607
}
609-
} else if (node instanceof TypeLiteral) {
610-
TypeLiteral tl = (TypeLiteral) node;
608+
} else if (node instanceof TypeLiteral tl) {
611609
addProposalsForType(tl.getType());
612610
// } else {
613611
// String[] arguments =
@@ -792,8 +790,7 @@ private void addProposals(Name name) throws CoreException, Exception {
792790
}
793791
if (name instanceof SimpleName) {
794792
addProposals(null, name.toString());
795-
} else if (name instanceof QualifiedName) {
796-
QualifiedName qualified = (QualifiedName) name;
793+
} else if (name instanceof QualifiedName qualified) {
797794
Name qualifier = qualified.getQualifier();
798795
addProposals(qualifier.toString(), qualified.getName()
799796
.toString());

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/templating/RepoTemplateContentProvider.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ public boolean hasChildren(Object element) {
101101
public Template getFirstTemplate() {
102102
Template result = null;
103103
if (roots != null && roots.length > 0) {
104-
if (roots[0] instanceof Category) {
105-
Category cat = (Category) roots[0];
104+
if (roots[0] instanceof Category cat) {
106105
Iterator<Template> templateIter = cat.getTemplates()
107106
.iterator();
108107
if (templateIter.hasNext()) {

‎ui/org.eclipse.pde.bnd.ui/src/org/eclipse/pde/bnd/ui/views/repository/RepositoriesView.java‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -346,15 +346,13 @@ public boolean performDrop(Object data) {
346346
} catch (Exception e) {
347347
return false;
348348
}
349-
} else if (data instanceof String[]) {
350-
String[] paths = (String[]) data;
349+
} else if (data instanceof String[] paths) {
351350
File[] files = new File[paths.length];
352351
for (int i = 0; i < paths.length; i++) {
353352
files[i] = new File(paths[i]);
354353
}
355354
copied = addFilesToRepository((RepositoryPlugin) getCurrentTarget(), files);
356-
} else if (data instanceof IResource[]) {
357-
IResource[] resources = (IResource[]) data;
355+
} else if (data instanceof IResource[] resources) {
358356
File[] files = new File[resources.length];
359357
for (int i = 0; i < resources.length; i++) {
360358
files[i] = resources[i].getLocation()
@@ -385,8 +383,7 @@ public boolean performDrop(Object data) {
385383
boolean writableRepoSelected = false;
386384
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
387385
Object element = selection.getFirstElement();
388-
if (element instanceof RepositoryPlugin) {
389-
RepositoryPlugin repo = (RepositoryPlugin) element;
386+
if (element instanceof RepositoryPlugin repo) {
390387
writableRepoSelected = repo.canWrite();
391388
}
392389
addBundlesAction.setEnabled(writableRepoSelected);
@@ -557,20 +554,18 @@ public void setFocus() {
557554
}
558555

559556
private static File[] convertSelectionToFiles(ISelection selection) {
560-
if (!(selection instanceof IStructuredSelection)) {
557+
if (!(selection instanceof IStructuredSelection structSel)) {
561558
return new File[0];
562559
}
563560

564-
IStructuredSelection structSel = (IStructuredSelection) selection;
565561
List<File> files = new ArrayList<>(structSel.size());
566562

567563
for (Iterator<?> iter = structSel.iterator(); iter.hasNext();) {
568564
Object element = iter.next();
569565
if (element instanceof IFile) {
570566
files.add(((IFile) element).getLocation()
571567
.toFile());
572-
} else if (element instanceof IAdaptable) {
573-
IAdaptable adaptable = (IAdaptable) element;
568+
} else if (element instanceof IAdaptable adaptable) {
574569
IFile ifile = adaptable.getAdapter(IFile.class);
575570
if (ifile != null) {
576571
files.add(ifile.getLocation()
@@ -671,8 +666,7 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
671666
public void run() {
672667
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
673668
Object element = selection.getFirstElement();
674-
if (element != null && element instanceof RepositoryPlugin) {
675-
RepositoryPlugin repo = (RepositoryPlugin) element;
669+
if (element != null && element instanceof RepositoryPlugin repo) {
676670
if (repo.canWrite()) {
677671
AddFilesToRepositoryWizard wizard = new AddFilesToRepositoryWizard(getWorkspace(), repo,
678672
new File[0]);
@@ -1006,12 +1000,10 @@ boolean performDrop(Object target, TransferData data, Object dropped) {
10061000
}
10071001

10081002
private Object toJava(Object dropped) {
1009-
if (dropped instanceof IStructuredSelection) {
1010-
IStructuredSelection selection = (IStructuredSelection) dropped;
1003+
if (dropped instanceof IStructuredSelection selection) {
10111004
if (!selection.isEmpty()) {
10121005
Object firstElement = selection.getFirstElement();
1013-
if (firstElement instanceof IResource) {
1014-
IResource resource = (IResource) firstElement;
1006+
if (firstElement instanceof IResource resource) {
10151007
IPath path = resource.getRawLocation();
10161008
if (path != null) {
10171009
File file = path.toFile();
@@ -1099,8 +1091,7 @@ Object toJava(TransferData data) throws Exception {
10991091
.getSelection();
11001092
if (selection instanceof IStructuredSelection) {
11011093
Object firstElement = ((IStructuredSelection) selection).getFirstElement();
1102-
if (firstElement instanceof IFile) {
1103-
IFile f = (IFile) firstElement;
1094+
if (firstElement instanceof IFile f) {
11041095
return f.getLocationURI();
11051096
}
11061097
}

0 commit comments

Comments
 (0)