Skip to content

Commit 61c4706

Browse files
eclipse-platform-botakurtakov
eclipse-platform-bot
authored and
akurtakov
committed
Perform clean code of bundles/org.eclipse.ui.navigator.resources
1 parent db3c109 commit 61c4706

26 files changed

+110
-100
lines changed

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/ProjectExplorerFilterActionGroup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class ProjectExplorerFilterActionGroup extends FilterActionGroup {
2727

2828
private SelectFiltersAction selectFiltersAction;
29-
private CommonViewer commonViewer;
29+
private final CommonViewer commonViewer;
3030

3131
public ProjectExplorerFilterActionGroup(CommonViewer aCommonViewer) {
3232
super(aCommonViewer);

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/ResourceToItemsMapper.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public class ResourceToItemsMapper implements ICommonViewerMapper {
3838
private static final int NUMBER_LIST_REUSE = 10;
3939

4040
// map from resource to item. Value can be single Item of List<Item>
41-
private HashMap<IResource, Object> _resourceToItem;
42-
private Stack<List<Item>> _reuseLists;
41+
private final HashMap<IResource, Object> _resourceToItem;
42+
private final Stack<List<Item>> _reuseLists;
4343

44-
private CommonViewer _commonViewer;
44+
private final CommonViewer _commonViewer;
4545

4646
public ResourceToItemsMapper(CommonViewer viewer) {
4747
_resourceToItem = new HashMap<>();

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/CopyAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
/**
5353
* The shell in which to show any dialogs.
5454
*/
55-
private Shell shell;
55+
private final Shell shell;
5656

5757
/**
5858
* System clipboard
5959
*/
60-
private Clipboard clipboard;
60+
private final Clipboard clipboard;
6161

6262
/**
6363
* Associated paste action. May be <code>null</code>

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/EditActionGroup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class EditActionGroup extends ActionGroup {
4646

4747
private TextActionHandler textActionHandler;
4848

49-
private Shell shell;
49+
private final Shell shell;
5050

5151
public EditActionGroup(Shell aShell) {
5252
shell = aShell;

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoResourceAction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ public void run() {
5151
dialog.open();
5252
Object[] result = dialog.getResult();
5353
if (result == null || result.length == 0
54-
|| !(result[0] instanceof IResource)) {
54+
|| !(result[0] instanceof IResource selection)) {
5555
return;
5656
}
5757

58-
IResource selection = (IResource) result[0];
5958
viewer.setSelection(new StructuredSelection(selection), true);
6059
}
6160
}

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/PasteAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
/**
5454
* The shell in which to show any dialogs.
5555
*/
56-
private Shell shell;
56+
private final Shell shell;
5757

5858
/**
5959
* System clipboard
6060
*/
61-
private Clipboard clipboard;
61+
private final Clipboard clipboard;
6262

6363
/**
6464
* Creates a new action.

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/PropertiesActionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void setContext(ActionContext context) {
7878

7979
private static class DelegateIAdaptable implements IAdaptable {
8080

81-
private Object delegate;
81+
private final Object delegate;
8282

8383
private DelegateIAdaptable(Object o) {
8484
delegate = o;
@@ -96,7 +96,7 @@ public <T> T getAdapter(Class<T> adapter) {
9696

9797
private static class DelegateSelectionProvider implements ISelectionProvider {
9898

99-
private ISelectionProvider delegate;
99+
private final ISelectionProvider delegate;
100100

101101
private DelegateSelectionProvider(ISelectionProvider s) {
102102
delegate = s;

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/RefactorActionGroup.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ public class RefactorActionGroup extends ActionGroup {
4343

4444
private MoveResourceAction moveAction;
4545

46-
private Shell shell;
46+
private final Shell shell;
4747

48-
private Tree tree;
48+
private final Tree tree;
4949

5050
private TextActionHandler textActionHandler;
5151

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ private static List<IProject> selectionToProjects(IStructuredSelection selection
168168
}
169169
List<IProject> resources = new ArrayList<>();
170170
for (Object currentObject : selection) {
171-
if (currentObject instanceof IWorkingSet) {
172-
IWorkingSet workingSet = (IWorkingSet) currentObject;
171+
if (currentObject instanceof IWorkingSet workingSet) {
173172
for (IAdaptable element : workingSet.getElements()) {
174173
IProject project = element.getAdapter(IProject.class);
175174
if (project != null) {

‎bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/WorkingSetActionProvider.java‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class WorkingSetActionProvider extends CommonActionProvider {
6363
private WorkingSetFilterActionGroup workingSetActionGroup;
6464
private WorkingSetRootModeActionGroup workingSetRootModeActionGroup;
6565

66-
private Object originalViewerInput = ResourcesPlugin.getWorkspace().getRoot();
66+
private final Object originalViewerInput = ResourcesPlugin.getWorkspace().getRoot();
6767

6868
private IExtensionStateModel extensionStateModel;
6969

@@ -110,8 +110,9 @@ public void propertyChange(PropertyChangeEvent event) {
110110
}
111111
}
112112
if (viewer != null) {
113-
if (newLabel != null)
113+
if (newLabel != null) {
114114
viewer.getCommonNavigator().setWorkingSetLabel(newLabel);
115+
}
115116
viewer.getFrameList().reset();
116117
viewer.refresh();
117118
}
@@ -138,10 +139,11 @@ public synchronized void ignore() {
138139
}
139140
}
140141

141-
private IPropertyChangeListener filterChangeListener = event -> {
142+
private final IPropertyChangeListener filterChangeListener = event -> {
142143

143-
if (ignoreFilterChangeEvents)
144+
if (ignoreFilterChangeEvents) {
144145
return;
146+
}
145147

146148
IWorkingSet newWorkingSet = (IWorkingSet) event.getNewValue();
147149

@@ -163,18 +165,19 @@ public synchronized void ignore() {
163165
} else {
164166
viewer.getCommonNavigator().setWorkingSetLabel(null);
165167
}
166-
} else
168+
} else {
167169
viewer.getCommonNavigator().setWorkingSetLabel(workingSet.getLabel());
170+
}
168171
} else {
169172
viewer.getCommonNavigator().setWorkingSetLabel(null);
170173
}
171174

172175
viewer.getFrameList().reset();
173176
};
174177

175-
private WorkingSetManagerListener managerChangeListener = new WorkingSetManagerListener();
178+
private final WorkingSetManagerListener managerChangeListener = new WorkingSetManagerListener();
176179

177-
private IExtensionActivationListener activationListener = new IExtensionActivationListener() {
180+
private final IExtensionActivationListener activationListener = new IExtensionActivationListener() {
178181

179182
private IWorkingSet savedWorkingSet;
180183

0 commit comments

Comments
 (0)