Skip to content

Commit 1bd21b6

Browse files
committed
Disallow IPackageFragmentRoot from being null within ProjectTypeContainers
In all current use cases of this internal class the value passed in was non-null anyway, so there is no functional change with this commit, it simply prevents future changes from trying to pass in a null here An extra complication is that in 02fa168 the javadoc was updated to allow null IPackageFragmentRoot but the code did not match that. Fixes eclipse-pde#2202 (comment)
1 parent 19e78d8 commit 1bd21b6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ProjectTypeContainer.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import java.util.ArrayList;
1717
import java.util.List;
18+
import java.util.Objects;
1819
import java.util.Set;
1920
import java.util.SortedSet;
2021
import java.util.TreeSet;
@@ -62,15 +63,13 @@ public class ProjectTypeContainer extends ApiElement implements IApiTypeContaine
6263
* @param parent the {@link IApiElement} parent for this container
6364
* @param container folder in the workspace
6465
* @param packageFragmentRoot optional package fragment root for JDT-based
65-
* package discovery, may be <code>null</code>
66+
* package discovery
6667
* @since 1.3.300
6768
*/
6869
public ProjectTypeContainer(IApiElement parent, IContainer container, IPackageFragmentRoot packageFragmentRoot) {
6970
super(parent, IApiElement.API_TYPE_CONTAINER, container.getName());
7071
this.fRoot = container;
71-
if (packageFragmentRoot != null) {
72-
this.fPackageFragmentRoots.add(packageFragmentRoot);
73-
}
72+
this.fPackageFragmentRoots.add(Objects.requireNonNull(packageFragmentRoot));
7473
}
7574

7675
/**
@@ -81,8 +80,9 @@ public ProjectTypeContainer(IApiElement parent, IContainer container, IPackageFr
8180
* @since 1.3.400
8281
*/
8382
public void addPackageFragmentRoot(IPackageFragmentRoot root) {
84-
if (root != null && !fPackageFragmentRoots.contains(root)) {
85-
fPackageFragmentRoots.add(root);
83+
IPackageFragmentRoot nonNullRoot = Objects.requireNonNull(root);
84+
if (!fPackageFragmentRoots.contains(nonNullRoot)) {
85+
fPackageFragmentRoots.add(nonNullRoot);
8686
// Clear cached package names so they will be recomputed
8787
fPackageNames = null;
8888
}

0 commit comments

Comments
 (0)