From f978710829617c65bf5d50acd9e88a37e690a1fd Mon Sep 17 00:00:00 2001 From: Svata Dedic Date: Wed, 13 Dec 2023 22:42:06 +0100 Subject: [PATCH] Return root node even though everything is filtered. --- .../org/netbeans/modules/project/dependency/Scope.java | 2 +- .../maven/queries/MavenDependenciesImplementation.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java index 92422dc0765b..85e9161c0d18 100644 --- a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java +++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java @@ -86,7 +86,7 @@ public final boolean equals(Object obj) { if (obj == null) { return false; } - if (getClass() != obj.getClass()) { + if (!(obj instanceof Scope)) { return false; } final Scope other = (Scope) obj; diff --git a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java index 4ed75f7b157a..b3a56b0bb2bd 100644 --- a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java +++ b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java @@ -264,10 +264,10 @@ private void findRealNodes(org.apache.maven.shared.dependency.tree.DependencyNod private Dependency convertDependencies(org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Set broken) { Map> realNodes = new HashMap<>(); findRealNodes(n, realNodes); - return convert2(n, filter, realNodes, broken); + return convert2(true, n, filter, realNodes, broken); } - private Dependency convert2(org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Map> realNodes, Set broken) { + private Dependency convert2(boolean root, org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Map> realNodes, Set broken) { List ch = new ArrayList<>(); List children = null; @@ -286,7 +286,7 @@ private Dependency convert2(org.apache.maven.shared.dependency.tree.DependencyNo } for (org.apache.maven.shared.dependency.tree.DependencyNode c : children) { - Dependency cd = convert2(c, filter, realNodes, broken); + Dependency cd = convert2(false, c, filter, realNodes, broken); if (cd != null) { ch.add(cd); } @@ -303,7 +303,7 @@ private Dependency convert2(org.apache.maven.shared.dependency.tree.DependencyNo } Scope s = scope(a); - if (!filter.accept(s, aspec)) { + if (!root && !filter.accept(s, aspec)) { return null; }