Skip to content

Commit 2ac0ff3

Browse files
committed
tmf.test: Remove redundant null annotations
Signed-off-by: Bernd Hufmann <[email protected]>
1 parent a632564 commit 2ac0ff3

File tree

1 file changed

+10
-11
lines changed
  • tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/model/tree

1 file changed

+10
-11
lines changed

tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/model/tree/TmfTreeModelTest.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**********************************************************************
2-
* Copyright (c) 2020 Ericsson
2+
* Copyright (c) 2020, 2025 Ericsson
33
*
44
* All rights reserved. This program and the accompanying materials are
55
* made available under the terms of the Eclipse Public License 2.0 which
@@ -16,7 +16,6 @@
1616
import java.util.ArrayList;
1717
import java.util.List;
1818

19-
import org.eclipse.jdt.annotation.NonNull;
2019
import org.eclipse.jdt.annotation.NonNullByDefault;
2120
import org.eclipse.jdt.annotation.Nullable;
2221
import org.eclipse.tracecompass.internal.provisional.tmf.core.model.TableColumnDescriptor;
@@ -42,11 +41,11 @@ public class TmfTreeModelTest {
4241
private static final String TOOLTIP_PREFIX = "tooltip";
4342
private static final String LABEL_PREFIX = "label";
4443
private static final String TEST_SCOPE = "scope";
45-
private static List<@NonNull ITmfTreeDataModel> fTestEntries = new ArrayList<>();
46-
private static List<@NonNull String> fTestHeaders = new ArrayList<>();
47-
private static List<@NonNull String> fExpectedEmptyTooltips = new ArrayList<>();
48-
private static List<@NonNull String> fExpectedTooltips = new ArrayList<>();
49-
private static List<@NonNull ITableColumnDescriptor> fTestDescriptors = new ArrayList<>();
44+
private static List<ITmfTreeDataModel> fTestEntries = new ArrayList<>();
45+
private static List<String> fTestHeaders = new ArrayList<>();
46+
private static List<String> fExpectedEmptyTooltips = new ArrayList<>();
47+
private static List<String> fExpectedTooltips = new ArrayList<>();
48+
private static List<ITableColumnDescriptor> fTestDescriptors = new ArrayList<>();
5049

5150
/**
5251
* Run once
@@ -82,14 +81,14 @@ public static void initClass() {
8281
*/
8382
@Test
8483
public void testTmfTreeModelConstructor() {
85-
TmfTreeModel<@NonNull ITmfTreeDataModel> testInstance = new TmfTreeModel<>(fTestHeaders, fTestEntries);
84+
TmfTreeModel<ITmfTreeDataModel> testInstance = new TmfTreeModel<>(fTestHeaders, fTestEntries);
8685
verifyInstance(testInstance, fExpectedEmptyTooltips, null);
8786

8887
testInstance = new TmfTreeModel<>(fTestHeaders, fTestEntries, TEST_SCOPE);
8988
verifyInstance(testInstance, fExpectedEmptyTooltips, TEST_SCOPE);
9089
}
9190

92-
private static void verifyInstance(TmfTreeModel<@NonNull ITmfTreeDataModel> testInstance, List<String> tooltips, @Nullable String scope) {
91+
private static void verifyInstance(TmfTreeModel<ITmfTreeDataModel> testInstance, List<String> tooltips, @Nullable String scope) {
9392
assertEquals("Incorrect list of entries", fTestEntries, testInstance.getEntries());
9493
assertEquals("Incorrect list of entries", fTestHeaders, testInstance.getHeaders());
9594

@@ -110,9 +109,9 @@ private static void verifyInstance(TmfTreeModel<@NonNull ITmfTreeDataModel> test
110109
@SuppressWarnings("javadoc")
111110
@Test
112111
public void testTmfTreeModelConstructor2() {
113-
TmfTreeModel.Builder<@NonNull ITmfTreeDataModel> builder = new TmfTreeModel.Builder<>();
112+
TmfTreeModel.Builder<ITmfTreeDataModel> builder = new TmfTreeModel.Builder<>();
114113
builder.setColumnDescriptors(fTestDescriptors).setEntries(fTestEntries);
115-
TmfTreeModel<@NonNull ITmfTreeDataModel> testInstance = builder.build();
114+
TmfTreeModel<ITmfTreeDataModel> testInstance = builder.build();
116115
verifyInstance(testInstance, fExpectedTooltips, null);
117116

118117
builder = new TmfTreeModel.Builder<>();

0 commit comments

Comments
 (0)