Skip to content

Commit 47febba

Browse files
akurtakovakurtakov
committed
Fix useless NLS.bind(.., null) usages
1 parent cb2fa1d commit 47febba

File tree

1 file changed

+34
-80
lines changed

1 file changed

+34
-80
lines changed

‎bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java

Lines changed: 34 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2008, 2019 Freescale Semiconductor and others.
2+
* Copyright (c) 2008, 2025 Freescale Semiconductor and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -216,8 +216,8 @@ public Filters(IContainer resource) {
216216
addChild(copy);
217217
}
218218
} catch (CoreException e) {
219-
ErrorDialog.openError(shell, NLS.bind(
220-
IDEWorkbenchMessages.InternalError, null), e
219+
ErrorDialog.openError(shell, IDEWorkbenchMessages.InternalError,
220+
e
221221
.getLocalizedMessage(), e.getStatus());
222222
}
223223
}
@@ -442,15 +442,9 @@ public void update(ViewerCell cell) {
442442
}
443443
if (column.equals(FilterTypeUtil.MODE)) {
444444
if (element.equals(includeOnlyGroup))
445-
cell.setText(NLS
446-
.bind(
447-
IDEWorkbenchMessages.ResourceFilterPage_includeOnlyColumn,
448-
null));
445+
cell.setText(IDEWorkbenchMessages.ResourceFilterPage_includeOnlyColumn);
449446
else
450-
cell.setText(NLS
451-
.bind(
452-
IDEWorkbenchMessages.ResourceFilterPage_excludeAllColumn,
453-
null));
447+
cell.setText(IDEWorkbenchMessages.ResourceFilterPage_excludeAllColumn);
454448
}
455449
}
456450
else {
@@ -564,8 +558,7 @@ public Control createContents(Composite parent) {
564558

565559
if (resource == null) {
566560
Label label = new Label(parent, SWT.NONE);
567-
label.setText(NLS.bind(
568-
IDEWorkbenchMessages.ResourceFilterPage_noResource, null));
561+
label.setText(IDEWorkbenchMessages.ResourceFilterPage_noResource);
569562
label.setFont(font);
570563
return label;
571564
}
@@ -588,8 +581,7 @@ public Control createContents(Composite parent) {
588581
composite.setFont(font);
589582

590583
Label label = new Label(composite, 0);
591-
label.setText(NLS.bind(IDEWorkbenchMessages.ResourceFilterPage_title,
592-
null));
584+
label.setText(IDEWorkbenchMessages.ResourceFilterPage_title);
593585
data = new GridData(GridData.FILL);
594586
data.horizontalSpan = 2;
595587
label.setLayoutData(data);
@@ -630,11 +622,7 @@ private void createViewerGroup(Composite parent) {
630622
filterView.addSelectionChangedListener(event -> refreshEnablement());
631623

632624
TreeColumn modeColumn = new TreeColumn(filterView.getTree(), 0);
633-
modeColumn
634-
.setText(NLS
635-
.bind(
636-
IDEWorkbenchMessages.ResourceFilterPage_columnFilterDescription,
637-
null));
625+
modeColumn.setText(IDEWorkbenchMessages.ResourceFilterPage_columnFilterDescription);
638626
modeColumn.setData(FilterTypeUtil.MODE);
639627
modeColumn.setResizable(true);
640628
modeColumn.setMoveable(false);
@@ -717,9 +705,7 @@ private static FontData[] getModifiedFontData(FontData[] originalData, int addit
717705
class EditFilterAction extends Action {
718706

719707
public EditFilterAction() {
720-
setText(NLS
721-
.bind(IDEWorkbenchMessages.ResourceFilterPage_editFilterActionLabel,
722-
null));
708+
setText(IDEWorkbenchMessages.ResourceFilterPage_editFilterActionLabel);
723709
}
724710

725711
@Override
@@ -743,9 +729,7 @@ public boolean isEnabled() {
743729
class RemoveFilterAction extends Action {
744730

745731
public RemoveFilterAction() {
746-
setText(NLS
747-
.bind(IDEWorkbenchMessages.ResourceFilterPage_removeFilterActionLabel,
748-
null));
732+
setText(IDEWorkbenchMessages.ResourceFilterPage_removeFilterActionLabel);
749733
}
750734

751735
@Override
@@ -769,11 +753,8 @@ class AddSubFilterAction extends Action {
769753

770754
public AddSubFilterAction(boolean createGroupOnly) {
771755
this.createGroupOnly = createGroupOnly;
772-
setText(NLS
773-
.bind(createGroupOnly ?
774-
IDEWorkbenchMessages.ResourceFilterPage_addSubFilterGroupActionLabel:
775-
IDEWorkbenchMessages.ResourceFilterPage_addSubFilterActionLabel,
776-
null));
756+
setText(createGroupOnly ? IDEWorkbenchMessages.ResourceFilterPage_addSubFilterGroupActionLabel
757+
: IDEWorkbenchMessages.ResourceFilterPage_addSubFilterActionLabel);
777758
}
778759

779760
@Override
@@ -962,8 +943,7 @@ private void createButtonGroup(Composite parent) {
962943
composite.setFont(parent.getFont());
963944

964945
addButton = new Button(composite, SWT.PUSH);
965-
addButton.setText(NLS.bind(
966-
IDEWorkbenchMessages.ResourceFilterPage_addButtonLabel, null));
946+
addButton.setText(IDEWorkbenchMessages.ResourceFilterPage_addButtonLabel);
967947
data = new GridData(SWT.FILL, SWT.FILL, false, false);
968948
addButton.setLayoutData(data);
969949
setButtonDimensionHint(addButton);
@@ -975,8 +955,7 @@ public void widgetSelected(SelectionEvent e) {
975955
});
976956

977957
addGroupButton = new Button(composite, SWT.PUSH);
978-
addGroupButton.setText(NLS.bind(
979-
IDEWorkbenchMessages.ResourceFilterPage_addGroupButtonLabel, null));
958+
addGroupButton.setText(IDEWorkbenchMessages.ResourceFilterPage_addGroupButtonLabel);
980959
data = new GridData(SWT.FILL, SWT.FILL, false, false);
981960
addGroupButton.setLayoutData(data);
982961
setButtonDimensionHint(addGroupButton);
@@ -989,8 +968,7 @@ public void widgetSelected(SelectionEvent e) {
989968

990969

991970
editButton = new Button(composite, SWT.PUSH);
992-
editButton.setText(NLS.bind(
993-
IDEWorkbenchMessages.ResourceFilterPage_editButtonLabel, null));
971+
editButton.setText(IDEWorkbenchMessages.ResourceFilterPage_editButtonLabel);
994972
data = new GridData(SWT.FILL, SWT.FILL, false, false);
995973
editButton.setLayoutData(data);
996974
setButtonDimensionHint(editButton);
@@ -1002,11 +980,7 @@ public void widgetSelected(SelectionEvent e) {
1002980
});
1003981

1004982
removeButton = new Button(composite, SWT.PUSH);
1005-
removeButton
1006-
.setText(NLS
1007-
.bind(
1008-
IDEWorkbenchMessages.ResourceFilterPage_removeButtonLabel,
1009-
null));
983+
removeButton.setText(IDEWorkbenchMessages.ResourceFilterPage_removeButtonLabel);
1010984
data = new GridData(SWT.FILL, SWT.FILL, false, false);
1011985
removeButton.setLayoutData(data);
1012986
setButtonDimensionHint(removeButton);
@@ -1192,9 +1166,8 @@ public boolean performOk() {
11921166
}
11931167
}
11941168
} catch (CoreException e) {
1195-
ErrorDialog.openError(shell, NLS.bind(
1196-
IDEWorkbenchMessages.InternalError, null), e
1197-
.getLocalizedMessage(), e.getStatus());
1169+
ErrorDialog.openError(shell, IDEWorkbenchMessages.InternalError,
1170+
e.getLocalizedMessage(), e.getStatus());
11981171
}
11991172
}
12001173
return true;
@@ -1315,10 +1288,8 @@ class FilterTypeUtil {
13151288

13161289
static String[] getModes() {
13171290
return new String[] {
1318-
NLS.bind(IDEWorkbenchMessages.ResourceFilterPage_includeOnly,
1319-
null),
1320-
NLS.bind(IDEWorkbenchMessages.ResourceFilterPage_excludeAll,
1321-
null) };
1291+
IDEWorkbenchMessages.ResourceFilterPage_includeOnly,
1292+
IDEWorkbenchMessages.ResourceFilterPage_excludeAll };
13221293
}
13231294

13241295
public static void setValue(FilterCopy filter, String property, Object value) {
@@ -1416,12 +1387,8 @@ static Object getValue(UIResourceFilterDescription filter, String property) {
14161387

14171388
static String[] getTargets() {
14181389
return new String[] {
1419-
NLS.bind(IDEWorkbenchMessages.ResourceFilterPage_files, null),
1420-
NLS.bind(IDEWorkbenchMessages.ResourceFilterPage_folders, null),
1421-
NLS
1422-
.bind(
1423-
IDEWorkbenchMessages.ResourceFilterPage_filesAndFolders,
1424-
null) };
1390+
IDEWorkbenchMessages.ResourceFilterPage_files, IDEWorkbenchMessages.ResourceFilterPage_folders,
1391+
IDEWorkbenchMessages.ResourceFilterPage_filesAndFolders };
14251392
}
14261393

14271394
static String[] getFilterNames(boolean groupOnly) {
@@ -1949,9 +1916,8 @@ private Control dialogCreateButtonBar(Composite parent) {
19491916
}
19501917

19511918
private void createInheritableArea(Font font, Composite composite) {
1952-
Composite inheritableComposite = createGroup(font, composite, NLS.bind(
1953-
IDEWorkbenchMessages.ResourceFilterPage_columnFilterMode,
1954-
null), false, false, 1);
1919+
Composite inheritableComposite = createGroup(font, composite,
1920+
IDEWorkbenchMessages.ResourceFilterPage_columnFilterMode, false, false, 1);
19551921
GridLayout layout = (GridLayout) inheritableComposite.getLayout();
19561922
layout.marginBottom = 0;
19571923
layout.marginTop = 0;
@@ -1966,11 +1932,7 @@ private void createInheritableArea(Font font, Composite composite) {
19661932
String label;
19671933
label = IDEWorkbenchMessages.ResourceFilterPage_applyRecursivelyToFolderStructure;
19681934

1969-
inherited
1970-
.setText(NLS
1971-
.bind(
1972-
label,
1973-
resource.getName()));
1935+
inherited.setText(NLS.bind(label, resource.getName()));
19741936
data = new GridData(SWT.FILL, SWT.CENTER, true, false);
19751937
data.horizontalSpan = 1;
19761938
inherited.setLayoutData(data);
@@ -1988,9 +1950,8 @@ public void widgetSelected(SelectionEvent e) {
19881950

19891951
private void createModeArea(Font font, Composite composite) {
19901952
GridData data;
1991-
Composite modeComposite = createGroup(font, composite, NLS.bind(
1992-
IDEWorkbenchMessages.ResourceFilterPage_columnFilterMode,
1993-
null), true, true, 1);
1953+
Composite modeComposite = createGroup(font, composite, IDEWorkbenchMessages.ResourceFilterPage_columnFilterMode,
1954+
true, true, 1);
19941955
String[] modes = FilterTypeUtil.getModes();
19951956
includeButton = new Button(modeComposite, SWT.RADIO);
19961957
includeButton.setText(modes[0]);
@@ -2154,7 +2115,7 @@ private Composite createGroup(Font font, Composite composite, String text,
21542115
private void createTargetArea(Font font, Composite composite) {
21552116
GridData data;
21562117
Composite targetComposite = createGroup(font, composite,
2157-
NLS.bind(IDEWorkbenchMessages.ResourceFilterPage_columnFilterTarget, null), false, true, 1);
2118+
IDEWorkbenchMessages.ResourceFilterPage_columnFilterTarget, false, true, 1);
21582119

21592120
String[] targets = FilterTypeUtil.getTargets();
21602121
filesButton = new Button(targetComposite, SWT.RADIO);
@@ -2456,16 +2417,13 @@ private void setupDescriptionText(String errorString) {
24562417
description.setText(""); //$NON-NLS-1$
24572418
if (selectedKeyOperatorType.equals(String.class)) {
24582419
if (!argumentsRegularExpresion.getSelection())
2459-
description.setText(NLS.bind(
2460-
IDEWorkbenchMessages.ResourceFilterPage_multiMatcher_Matcher, null));
2420+
description.setText(IDEWorkbenchMessages.ResourceFilterPage_multiMatcher_Matcher);
24612421
}
24622422
if (selectedKeyOperatorType.equals(Integer.class)) {
24632423
if (selectedKey.equals(FileInfoAttributesMatcher.KEY_LAST_MODIFIED) || selectedKey.equals(FileInfoAttributesMatcher.KEY_CREATED))
2464-
description.setText(NLS.bind(
2465-
IDEWorkbenchMessages.ResourceFilterPage_multiMatcher_TimeInterval, null));
2424+
description.setText(IDEWorkbenchMessages.ResourceFilterPage_multiMatcher_TimeInterval);
24662425
else
2467-
description.setText(NLS.bind(
2468-
IDEWorkbenchMessages.ResourceFilterPage_multiMatcher_FileLength, null));
2426+
description.setText(IDEWorkbenchMessages.ResourceFilterPage_multiMatcher_FileLength);
24692427
}
24702428
}
24712429
shell.layout(true, true);
@@ -2635,15 +2593,13 @@ private void setupMultiOperatorAndField(boolean updateOperator) {
26352593
stringArgumentComposite.setFont(multiArgumentComposite.getFont());
26362594

26372595
argumentsCaseSensitive = new Button(stringArgumentComposite, SWT.CHECK);
2638-
argumentsCaseSensitive.setText(NLS.bind(
2639-
IDEWorkbenchMessages.ResourceFilterPage_caseSensitive, null));
2596+
argumentsCaseSensitive.setText(IDEWorkbenchMessages.ResourceFilterPage_caseSensitive);
26402597
data = new GridData(SWT.LEFT, SWT.CENTER, false, false);
26412598
argumentsCaseSensitive.setLayoutData(data);
26422599
argumentsCaseSensitive.setFont(multiArgumentComposite.getFont());
26432600

26442601
argumentsRegularExpresion = new Button(stringArgumentComposite, SWT.CHECK);
2645-
argumentsRegularExpresion.setText(NLS.bind(
2646-
IDEWorkbenchMessages.ResourceFilterPage_regularExpression, null));
2602+
argumentsRegularExpresion.setText(IDEWorkbenchMessages.ResourceFilterPage_regularExpression);
26472603
data = new GridData(SWT.LEFT, SWT.CENTER, false, false);
26482604
data.minimumWidth = 100;
26492605
argumentsRegularExpresion.setLayoutData(data);
@@ -3089,9 +3045,7 @@ public void create(Composite argumentComposite, Font font) {
30893045

30903046
private void createArgumentsArea(Font font, Composite composite) {
30913047
GridData data;
3092-
argumentsLabel = addLabel(composite, NLS.bind(
3093-
IDEWorkbenchMessages.ResourceFilterPage_columnFilterPattern,
3094-
null));
3048+
argumentsLabel = addLabel(composite, IDEWorkbenchMessages.ResourceFilterPage_columnFilterPattern);
30953049
arguments = new Text(composite, SWT.SINGLE | SWT.BORDER);
30963050
data = new GridData(SWT.FILL, SWT.CENTER, true, false);
30973051
arguments.setLayoutData(data);

0 commit comments

Comments
 (0)