Skip to content

Commit 5b3160c

Browse files
eclipse-platform-botHeikoKlare
authored andcommitted
Perform clean code of bundles/org.eclipse.text.quicksearch
1 parent 153dc22 commit 5b3160c

File tree

9 files changed

+29
-25
lines changed

9 files changed

+29
-25
lines changed

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/LineItem.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,22 @@ public int hashCode() {
8080

8181
@Override
8282
public boolean equals(Object obj) {
83-
if (this == obj)
83+
if (this == obj) {
8484
return true;
85-
if (obj == null)
85+
}
86+
if (obj == null) {
8687
return false;
87-
if (getClass() != obj.getClass())
88+
}
89+
if (getClass() != obj.getClass()) {
8890
return false;
91+
}
8992
LineItem other = (LineItem) obj;
9093
if (!Objects.equals(f, other.f)) {
9194
return false;
9295
}
93-
if (lineNumber != other.lineNumber)
96+
if (lineNumber != other.lineNumber) {
9497
return false;
98+
}
9599
return true;
96100
}
97101

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextQuery.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public int getOffset() {
4646
}
4747
}
4848

49-
private boolean caseInsensitive;
50-
private String orgPattern; //Original pattern case preserved even if search is case insensitive.
49+
private final boolean caseInsensitive;
50+
private final String orgPattern; //Original pattern case preserved even if search is case insensitive.
5151
final Pattern pattern;
5252

5353
/**

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/QuickTextSearcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class QuickTextSearcher {
5353
/**
5454
* Scheduling rule used by Jobs that work on the matches collection.
5555
*/
56-
private ISchedulingRule matchesRule = new LightSchedulingRule("QuickSearchMatchesRule"); //$NON-NLS-1$
56+
private final ISchedulingRule matchesRule = new LightSchedulingRule("QuickSearchMatchesRule"); //$NON-NLS-1$
5757

5858
private final SearchInFilesWalker walker;
5959
private IncrementalUpdateJob incrementalUpdate;

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/preferences/QuickSearchPreferences.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class QuickSearchPreferences {
3636
public static final String MAX_RESULTS = "QuickTextSearcher.MAX_RESULTS"; //$NON-NLS-1$
3737
private static boolean initializedDefaults;
3838

39-
private IPreferenceStore store;
39+
private final IPreferenceStore store;
4040

4141
public QuickSearchPreferences(IPreferenceStore preferenceStore) {
4242
this.store = preferenceStore;

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/core/priority/PrioriTree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static void debug(String string) {
5959
* <p>
6060
* Level is used to easily check whether a node lookup returned an exact matching node or an ancestor.
6161
*/
62-
private int level;
62+
private final int level;
6363

6464
/**
6565
* Priority assigned to any path lookup that ends here.

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchContext.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class QuickSearchContext {
5454
*/
5555
private static Collection<IFile> lastOpenFiles = Arrays.asList(); //Empty list to start with.
5656

57-
private IWorkbenchWindow window;
57+
private final IWorkbenchWindow window;
5858

5959
public QuickSearchContext(IWorkbenchWindow window) {
6060
this.window = window;
@@ -163,16 +163,14 @@ private Collection<IResource> getSelectedResources() {
163163
}
164164
ISelectionService selectionService = window.getSelectionService();
165165
ISelection selection = selectionService.getSelection();
166-
if (selection instanceof IStructuredSelection) {
167-
IStructuredSelection structuredSelection = (IStructuredSelection) selection;
166+
if (selection instanceof IStructuredSelection structuredSelection) {
168167
if (!structuredSelection.isEmpty()) {
169168
Object[] elements = structuredSelection.toArray();
170169
List<IResource> resources = new ArrayList<>(elements.length);
171170
for (Object e : elements) {
172171
if (e instanceof IResource) {
173172
resources.add((IResource) e);
174-
} else if (e instanceof IAdaptable) {
175-
IAdaptable ae = (IAdaptable) e;
173+
} else if (e instanceof IAdaptable ae) {
176174
IResource r = ae.getAdapter(IResource.class);
177175
if (r!=null) {
178176
resources.add(r);

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchDialog.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public class QuickSearchDialog extends SelectionStatusDialog {
157157

158158
public static final Styler HIGHLIGHT_STYLE = org.eclipse.search.internal.ui.text.DecoratingFileSearchLabelProvider.HIGHLIGHT_STYLE;
159159

160-
private UIJob refreshJob = UIJob.create(Messages.QuickSearchDialog_RefreshJob,
160+
private final UIJob refreshJob = UIJob.create(Messages.QuickSearchDialog_RefreshJob,
161161
(ICoreRunnable) m -> refreshWidgets());
162162

163163
protected void openSelection() {
@@ -358,15 +358,15 @@ public void update(ViewerCell cell) {
358358

359359
private MenuManager contextMenuManager;
360360

361-
private boolean multi;
361+
private final boolean multi;
362362

363363
private ToolBar toolBar;
364364

365365
private ToolItem toolItem;
366366

367367
private Label progressLabel;
368368

369-
private ContentProvider contentProvider;
369+
private final ContentProvider contentProvider;
370370

371371
private String initialPatternText;
372372

@@ -393,14 +393,14 @@ public void update(ViewerCell cell) {
393393
private ToggleKeepOpenAction toggleKeepOpenAction;
394394

395395

396-
private QuickSearchContext context;
396+
private final QuickSearchContext context;
397397

398398

399399
private SashForm sashForm;
400400

401401
private Label headerLabel;
402402

403-
private IWorkbenchWindow window;
403+
private final IWorkbenchWindow window;
404404
private Combo searchIn;
405405
private Label listLabel;
406406

@@ -570,10 +570,12 @@ public boolean close() {
570570
showViewHandler.getHandler().dispose();
571571
showViewHandler = null;
572572
}
573-
if (menuManager != null)
573+
if (menuManager != null) {
574574
menuManager.dispose();
575-
if (contextMenuManager != null)
575+
}
576+
if (contextMenuManager != null) {
576577
contextMenuManager.dispose();
578+
}
577579
storeDialog(getDialogSettings());
578580
if (searcher!=null) {
579581
searcher.cancel();
@@ -956,7 +958,7 @@ public void keyPressed(KeyEvent e) {
956958
});
957959

958960
createDetailsArea(sashForm);
959-
sashForm.setWeights(new int[] {5,2});
961+
sashForm.setWeights(5, 2);
960962

961963
applyDialogFont(content);
962964

@@ -1512,7 +1514,7 @@ private void applyPathMatcher() {
15121514
*/
15131515
private class ContentProvider implements IStructuredContentProvider, ILazyContentProvider {
15141516

1515-
private List items;
1517+
private final List items;
15161518
private Comparator<LineItem> comparator;
15171519
/**
15181520
* Creates new instance of <code>ContentProvider</code>.

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/ui/QuickSearchQuickAccessComputer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class QuickSearchQuickAccessComputer extends QuickTextSearchRequestor imp
3535

3636
private static final int MAX_ENTRIES = 20;
3737
private static final long TIMEOUT = 200;
38-
private PriorityFunction priorities;
38+
private final PriorityFunction priorities;
3939

4040
public QuickSearchQuickAccessComputer() {
4141
priorities = new QuickSearchContext(PlatformUI.getWorkbench().getActiveWorkbenchWindow()).createPriorityFun();

bundles/org.eclipse.text.quicksearch/src/org/eclipse/text/quicksearch/internal/util/LineReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public LineReader(Reader reader, int maxLineLength) {
4848
}
4949

5050

51-
private StringBuilder line = new StringBuilder(EXPECTED_LINE_LENGTH);
51+
private final StringBuilder line = new StringBuilder(EXPECTED_LINE_LENGTH);
5252

5353
private final int maxLineLength;
5454
private int lineOffset = -1; //Start pos of last line read.

0 commit comments

Comments
 (0)