Skip to content

Commit 0d9da79

Browse files
eclipse-pde-botlaeubi
eclipse-pde-bot
authored and
laeubi
committed
Perform clean code of ua/org.eclipse.pde.ua.ui
1 parent 5d4fd66 commit 0d9da79

15 files changed

Lines changed: 34 additions & 69 deletions

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,7 @@ private void handleMoveTaskObjectAction(int positionFlag) {
331331
Object object = sel.getFirstElement();
332332
if (object == null) {
333333
return;
334-
} else if (object instanceof ICompCSTaskObject) {
335-
ICompCSTaskObject taskObject = (ICompCSTaskObject) object;
334+
} else if (object instanceof ICompCSTaskObject taskObject) {
336335
ICompCSTaskGroup parent = null;
337336
// Determine the parents type
338337
if (taskObject.getParent().getType() == ICompCSConstants.TYPE_TASKGROUP) {
@@ -354,16 +353,14 @@ private void handlePreviewAction() {
354353
IEditorInput input = getPage().getEditorInput();
355354
URL url = null;
356355
try {
357-
if (input instanceof IFileEditorInput) {
358-
IFileEditorInput fileInput = (IFileEditorInput) input;
356+
if (input instanceof IFileEditorInput fileInput) {
359357
url = fileInput.getFile().getLocationURI().toURL();
360-
} else if (input instanceof IStorageEditorInput) {
358+
} else if (input instanceof IStorageEditorInput storageInput) {
361359
// Note: This URL does not exist on the local file system
362360
// As a result any tasks this composite cheat sheet has that
363361
// specify a pathes to simple cheat sheets will not resolve
364362
// Cheat sheet view will log an error loading simple cheat
365363
// sheets
366-
IStorageEditorInput storageInput = (IStorageEditorInput) input;
367364
url = storageInput.getStorage().getFullPath().toFile().toURI()
368365
.toURL();
369366
} else {
@@ -586,8 +583,7 @@ private void handleDeleteAction() {
586583
IStructuredSelection sel = fTreeViewer.getStructuredSelection();
587584
Object object = sel.getFirstElement();
588585
if (object != null) {
589-
if (object instanceof ICompCSTaskObject) {
590-
ICompCSTaskObject taskObject = (ICompCSTaskObject) object;
586+
if (object instanceof ICompCSTaskObject taskObject) {
591587
ICompCSObject parent = taskObject.getParent();
592588
if (canRemoveTaskObject(parent) == false) {
593589
// Preserve cheat sheet validity

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -862,11 +862,9 @@ private void handleAddSubStepAction() {
862862
private void handleMoveStepAction(int positionFlag) {
863863
ISimpleCSObject object = getCurrentSelection();
864864
if (object != null) {
865-
if (object instanceof ISimpleCSItem) {
866-
ISimpleCSItem item = (ISimpleCSItem) object;
865+
if (object instanceof ISimpleCSItem item) {
867866
item.getSimpleCS().moveItem(item, positionFlag);
868-
} else if (object instanceof ISimpleCSSubItem) {
869-
ISimpleCSSubItem subitem = (ISimpleCSSubItem) object;
867+
} else if (object instanceof ISimpleCSSubItem subitem) {
870868
// Get the current index of the subitem
871869
ISimpleCSObject parent = subitem.getParent();
872870
if (parent.getType() == ISimpleCSConstants.TYPE_ITEM) {
@@ -1128,8 +1126,7 @@ public boolean doGlobalAction(String actionId) {
11281126
private void handleDeleteAction() {
11291127
ISimpleCSObject object = getCurrentSelection();
11301128
if (object != null) {
1131-
if (object instanceof ISimpleCSItem) {
1132-
ISimpleCSItem item = (ISimpleCSItem) object;
1129+
if (object instanceof ISimpleCSItem item) {
11331130
// Preserve cheat sheet validity
11341131
// Semantic Rule: Cannot have a cheat sheet with no items
11351132
if (item.getSimpleCS().getItemCount() > 1) {

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,9 @@ private void handleButtonSelectedEventBrowse(SelectionEvent event) {
267267
// Get the selection
268268
Object result = dialog.getFirstResult();
269269
// Ensure a file was selected
270-
if (!(result instanceof IFile)) {
270+
if (!(result instanceof IFile file)) {
271271
return;
272272
}
273-
IFile file = (IFile) result;
274273
// Get the absolute path
275274
String absolutePath = file.getFullPath().toPortableString();
276275
// Update the field

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpEditor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,7 @@ public ISelection getSelection() {
260260

261261
@Override
262262
public boolean canCut(ISelection selection) {
263-
if (selection instanceof IStructuredSelection) {
264-
IStructuredSelection sel = (IStructuredSelection) selection;
263+
if (selection instanceof IStructuredSelection sel) {
265264
for (Iterator<?> iter = sel.iterator(); iter.hasNext();) {
266265
Object obj = iter.next();
267266
if (obj instanceof CtxHelpObject && ((CtxHelpObject) obj).canBeRemoved()) {

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/ctxhelp/CtxHelpTreeSection.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,7 @@ private void handleMoveAction(int positionFlag) {
753753
Object object = sel.getFirstElement();
754754
if (object == null) {
755755
return;
756-
} else if (object instanceof CtxHelpObject) {
757-
CtxHelpObject ctxHelpObject = (CtxHelpObject) object;
756+
} else if (object instanceof CtxHelpObject ctxHelpObject) {
758757
CtxHelpObject parent = ctxHelpObject.getParent();
759758
if (parent != null) {
760759
parent.moveChild(ctxHelpObject, positionFlag);
@@ -961,8 +960,7 @@ private void handleModelEventWorldChanged(IModelChangedEvent event) {
961960
private void handleModelInsertType(IModelChangedEvent event) {
962961
Object[] objects = event.getChangedObjects();
963962
for (Object o : objects) {
964-
if (o instanceof CtxHelpObject) {
965-
CtxHelpObject object = (CtxHelpObject) o;
963+
if (o instanceof CtxHelpObject object) {
966964
if (object.getType() != ICtxHelpConstants.TYPE_ROOT) {
967965
fTree.refresh(object.getParent());
968966
// Select the new object in the tree, unless it is a
@@ -985,8 +983,7 @@ private void handleModelInsertType(IModelChangedEvent event) {
985983
private void handleModelRemoveType(IModelChangedEvent event) {
986984
Object[] objects = event.getChangedObjects();
987985
for (Object o : objects) {
988-
if (o instanceof CtxHelpObject) {
989-
CtxHelpObject object = (CtxHelpObject) o;
986+
if (o instanceof CtxHelpObject object) {
990987
fTree.remove(object);
991988
CtxHelpObject nextSelection = fRemoveObjectAction
992989
.getNextSelection();

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@ public TocDropAdapter(TreeViewer tocTree, TocTreeSection section) {
6060
*/
6161
@Override
6262
protected int determineLocation(DropTargetEvent event) {
63-
if (!(event.item instanceof Item)) {
63+
if (!(event.item instanceof Item item)) {
6464
return LOCATION_NONE;
6565
}
66-
Item item = (Item) event.item;
6766
Point coordinates = new Point(event.x, event.y);
6867
coordinates = getViewer().getControl().toControl(coordinates);
6968
if (item != null) {

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,7 @@ public ISelection getSelection() {
285285

286286
@Override
287287
public boolean canCut(ISelection selection) {
288-
if (selection instanceof IStructuredSelection) {
289-
IStructuredSelection sel = (IStructuredSelection) selection;
288+
if (selection instanceof IStructuredSelection sel) {
290289
for (Iterator<?> iter = sel.iterator(); iter.hasNext();) {
291290
Object obj = iter.next();
292291
if (obj instanceof TocObject

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ protected IHyperlink[] detectAttributeHyperlink(IDocumentAttributeNode attr) {
4040
}
4141

4242
IDocumentElementNode node = attr.getEnclosingElement();
43-
if (node == null || !(node instanceof TocObject) || !((TocObject) node).getModel().isEditable()) {
43+
if (node == null || !(node instanceof TocObject tocObject) || !tocObject.getModel().isEditable()) {
4444
return null;
4545
}
4646

47-
TocObject tocObject = (TocObject) node;
4847
TocModel model = tocObject.getModel();
4948
IResource res = model.getUnderlyingResource();
5049
IRegion linkRegion = new Region(attr.getValueOffset(), attr.getValueLength());

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ private void handleModelEventWorldChanged(IModelChangedEvent event) {
137137

138138
Object[] objects = event.getChangedObjects();
139139

140-
if (objects[0] != null && objects[0] instanceof TocObject) {
141-
TocObject object = (TocObject) objects[0];
140+
if (objects[0] != null && objects[0] instanceof TocObject object) {
142141
if (object.getType() == ITocConstants.TYPE_TOC) {
143142
String newValue = ((Toc) object).getFieldLabel();
144143

‎ua/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -696,11 +696,10 @@ private IFile showNewWizard(String path, boolean tocWizard) {
696696
// Get the wizard page
697697
IWizardPage wizardPage;
698698
wizardPage = wizard.getStartingPage();
699-
if (!(wizardPage instanceof WizardNewFileCreationPage)) {
699+
if (!(wizardPage instanceof WizardNewFileCreationPage page)) {
700700
return null;
701701
}
702702

703-
WizardNewFileCreationPage page = (WizardNewFileCreationPage) wizardPage;
704703
if (filename != null) {
705704
page.setFileName(filename);
706705
// Inhibit the error message when the wizard is first opened
@@ -1142,9 +1141,7 @@ private void handleDeleteAction() {
11421141
// that cannot be removed
11431142
for (Iterator<?> i = objects.iterator(); i.hasNext();) {
11441143
Object object = i.next();
1145-
if (object instanceof TocObject) {
1146-
TocObject tocObject = (TocObject) object;
1147-
1144+
if (object instanceof TocObject tocObject) {
11481145
if (!tocObject.canBeRemoved()) {
11491146
i.remove();
11501147
beep = true;
@@ -1203,8 +1200,7 @@ private void handleMoveAction(int positionFlag) {
12031200
Object object = iter.next();
12041201
if (object == null) {
12051202
return;
1206-
} else if (object instanceof TocObject) {
1207-
TocObject tocObject = (TocObject) object;
1203+
} else if (object instanceof TocObject tocObject) {
12081204
TocTopic parent = (TocTopic) tocObject.getParent();
12091205

12101206
// Determine the parent type

0 commit comments

Comments
 (0)