Skip to content

Commit 149c73e

Browse files
sebthomsebthom
committed
fix(deps): bump com.vegardit.no-npe:no-npe-eea-all from 1.3.3 to 1.3.4
1 parent b826020 commit 149c73e

12 files changed

Lines changed: 24 additions & 41 deletions

File tree

‎org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/ToggleLineCommentHandler.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ public class ToggleLineCommentHandler extends AbstractHandler {
5252
}
5353

5454
@Override
55-
public @Nullable Object execute(final @Nullable ExecutionEvent event) throws ExecutionException {
56-
if (event == null) {
57-
return null;
58-
}
55+
public @Nullable Object execute(final ExecutionEvent event) throws ExecutionException {
5956
final var part = HandlerUtil.getActiveEditor(event);
6057
final var editor = adapt(part, ITextEditor.class);
6158
if (editor == null) {

‎org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/preferences/LanguageConfigurationPreferencePage.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static org.eclipse.tm4e.core.internal.utils.NullSafetyHelper.lateNonNull;
1717
import static org.eclipse.tm4e.languageconfiguration.internal.LanguageConfigurationMessages.*;
1818

19-
import org.eclipse.jdt.annotation.NonNullByDefault;
2019
import org.eclipse.jdt.annotation.Nullable;
2120
import org.eclipse.jface.dialogs.Dialog;
2221
import org.eclipse.jface.layout.GridDataFactory;
@@ -53,7 +52,7 @@ public LanguageConfigurationPreferencePage() {
5352
}
5453

5554
@Override
56-
protected Control createContents(final @NonNullByDefault({}) Composite parent) {
55+
protected Control createContents(final Composite parent) {
5756
final var control = new Composite(parent, SWT.NONE);
5857
control.setLayout(GridLayoutFactory.fillDefaults().create());
5958

‎org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/LanguageConfigurationImportWizard.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
import static org.eclipse.tm4e.core.internal.utils.NullSafetyHelper.lateNonNull;
1515

16-
import org.eclipse.jdt.annotation.Nullable;
1716
import org.eclipse.jface.viewers.IStructuredSelection;
1817
import org.eclipse.jface.wizard.Wizard;
1918
import org.eclipse.tm4e.languageconfiguration.LanguageConfigurationPlugin;
@@ -62,7 +61,7 @@ public boolean performFinish() {
6261
}
6362

6463
@Override
65-
public void init(final @Nullable IWorkbench workbench, final @Nullable IStructuredSelection selection) {
64+
public void init(final IWorkbench workbench, final IStructuredSelection selection) {
6665
}
6766

6867
public ILanguageConfigurationDefinition getCreatedDefinition() {

‎org.eclipse.tm4e.languageconfiguration/src/main/java/org/eclipse/tm4e/languageconfiguration/internal/wizards/SelectLanguageConfigurationWizardPage.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,8 @@ private void createContentTypeTreeViewer(final Composite composite) {
202202

203203
private static final class ContentTypesLabelProvider extends LabelProvider {
204204
@Override
205-
public @Nullable String getText(final @Nullable Object element) {
206-
return element == null
207-
? ""
208-
: ((IContentType) element).getName();
205+
public @Nullable String getText(final Object element) {
206+
return ((IContentType) element).getName();
209207
}
210208
}
211209

@@ -214,7 +212,7 @@ private static final class ContentTypesContentProvider implements ITreeContentPr
214212
private IContentTypeManager manager = Platform.getContentTypeManager();
215213

216214
@Override
217-
public Object[] getChildren(final @Nullable Object parentElement) {
215+
public Object[] getChildren(final Object parentElement) {
218216
final var elements = new ArrayList<>();
219217
final var baseType = (IContentType) parentElement;
220218
for (final var contentType : manager.getAllContentTypes()) {
@@ -226,21 +224,20 @@ public Object[] getChildren(final @Nullable Object parentElement) {
226224
}
227225

228226
@Override
229-
public @Nullable Object getParent(final @Nullable Object element) {
230-
if (element == null)
231-
return null;
227+
public @Nullable Object getParent(final Object element) {
232228
final IContentType contentType = (IContentType) element;
233229
return contentType.getBaseType();
234230
}
235231

236232
@Override
237-
public boolean hasChildren(final @Nullable Object element) {
233+
public boolean hasChildren(final Object element) {
238234
return getChildren(element).length > 0;
239235
}
240236

241237
@Override
242238
public Object[] getElements(final @Nullable Object inputElement) {
243-
return getChildren(manager.getContentType(IContentTypeManager.CT_TEXT));
239+
final var ctype = manager.getContentType(IContentTypeManager.CT_TEXT);
240+
return ctype == null ? new Object[0] : getChildren(ctype);
244241
}
245242

246243
@Override

‎org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/preferences/TaskTagsPreferencePage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void createTypeCombo(final Composite parent) {
141141
label.setText(TMUIMessages.TaskTagsPreferencePage_column_type);
142142
cmbType = new Combo(parent, SWT.READ_ONLY);
143143
cmbType.setItems(Stream.of(MarkerConfig.Type.values()).map(Enum::name).toArray(String[]::new));
144-
cmbType.addListener(SWT.Modify, (final @Nullable Event e) -> {
144+
cmbType.addListener(SWT.Modify, (final Event e) -> {
145145
if (!cmbType.getText().isBlank())
146146
switch (MarkerConfig.Type.valueOf(cmbType.getText())) {
147147
case PROBLEM:

‎org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ColumnSelectionAdapter.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*/
1212
package org.eclipse.tm4e.ui.internal.widgets;
1313

14-
import org.eclipse.jdt.annotation.Nullable;
1514
import org.eclipse.jface.viewers.TableViewer;
1615
import org.eclipse.swt.events.SelectionAdapter;
1716
import org.eclipse.swt.events.SelectionEvent;
@@ -20,7 +19,6 @@
2019

2120
/**
2221
* Sort the selected column and refresh the viewer.
23-
*
2422
*/
2523
public final class ColumnSelectionAdapter extends SelectionAdapter {
2624

@@ -36,8 +34,8 @@ public ColumnSelectionAdapter(final TableViewer tableViewer,
3634
}
3735

3836
@Override
39-
public void widgetSelected(final @Nullable SelectionEvent e) {
40-
if (e != null && e.getSource() instanceof final TableColumn tableColumn) {
37+
public void widgetSelected(final SelectionEvent e) {
38+
if (e.getSource() instanceof final TableColumn tableColumn) {
4139
int columnIndex = -1;
4240
final TableColumn[] columns = tableViewer.getTable().getColumns();
4341
for (int i = 0; i < columns.length; i++) {

‎org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/GrammarDefinitionLabelProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public final class GrammarDefinitionLabelProvider extends LabelProvider implemen
2828
}
2929

3030
@Override
31-
public @Nullable String getText(final @Nullable Object element) {
31+
public @Nullable String getText(final Object element) {
3232
return getColumnText(element, 0);
3333
}
3434

‎org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/TableWidget.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private final class CellLabelProvider extends LabelProvider implements ITableLab
5858
}
5959

6060
@Override
61-
public @Nullable String getText(final @Nullable Object element) {
61+
public @Nullable String getText(final Object element) {
6262
return getColumnText(element, 0);
6363
}
6464
}

‎org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/widgets/ThemeLabelProvider.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,18 @@ public final class ThemeLabelProvider extends LabelProvider implements ITableLab
2828
}
2929

3030
@Override
31-
public @Nullable String getText(final @Nullable Object element) {
32-
if (element == null)
33-
return "";
34-
final ITheme theme = (ITheme) element;
35-
return theme.getName();
31+
public @Nullable String getText(final Object element) {
32+
return ((ITheme) element).getName();
3633
}
3734

3835
@Override
3936
public @Nullable String getColumnText(final @Nullable Object element, final int columnIndex) {
4037
if (element == null)
4138
return "";
42-
final ITheme theme = (ITheme) element;
4339
return switch (columnIndex) {
44-
case 0 -> theme.getName();
45-
case 1 -> theme.getPath();
46-
case 2 -> theme.getPluginId();
40+
case 0 -> ((ITheme) element).getName();
41+
case 1 -> ((ITheme) element).getPath();
42+
case 2 -> ((ITheme) element).getPluginId();
4743
default -> ""; //$NON-NLS-1$
4844
};
4945
}

‎org.eclipse.tm4e.ui/src/main/java/org/eclipse/tm4e/ui/internal/wizards/SelectGrammarWizardPage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected void createBody(final Composite ancestor) {
9797
browseFileSystemButton.setText(TMUIMessages.Button_browse_FileSystem);
9898
browseFileSystemButton.addSelectionListener(new SelectionAdapter() {
9999
@Override
100-
public void widgetSelected(final @Nullable SelectionEvent e) {
100+
public void widgetSelected(final SelectionEvent e) {
101101
final var dialog = new FileDialog(parent.getShell());
102102
dialog.setFilterExtensions(new String[] { Stream.of(TEXTMATE_GRAMMAR_FILE_FILTERS).collect(Collectors.joining(";")) });
103103
dialog.setFilterPath(grammarFileText.getText());
@@ -112,7 +112,7 @@ public void widgetSelected(final @Nullable SelectionEvent e) {
112112
browseWorkspaceButton.setText(TMUIMessages.Button_browse_Workspace);
113113
browseWorkspaceButton.addSelectionListener(new SelectionAdapter() {
114114
@Override
115-
public void widgetSelected(final @Nullable SelectionEvent e) {
115+
public void widgetSelected(final SelectionEvent e) {
116116
final var dialog = new ElementTreeSelectionDialog(parent.getShell(), new WorkbenchLabelProvider(),
117117
new WorkbenchContentProvider());
118118
dialog.setTitle("TextMate grammar selection");

0 commit comments

Comments
 (0)