This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 07f198b4b1b4c9cf303739dba501872343a61035 Author: Svata Dedic <[email protected]> AuthorDate: Wed Dec 13 22:42:06 2023 +0100 Return root node even though everything is filtered. --- .../src/org/netbeans/modules/project/dependency/Scope.java | 3 --- .../modules/maven/queries/MavenDependenciesImplementation.java | 8 ++++---- 2 files changed, 4 insertions(+), 7 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 92422dc076..693f06337d 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,9 +86,6 @@ public abstract class Scope { if (obj == null) { return false; } - if (getClass() != obj.getClass()) { - return false; - } final Scope other = (Scope) obj; return Objects.equals(this.name, other.name); } 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 4ed75f7b15..b3a56b0bb2 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 @@ public class MavenDependenciesImplementation implements ProjectDependenciesImple private Dependency convertDependencies(org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Set<ArtifactSpec> broken) { Map<String, List<org.apache.maven.shared.dependency.tree.DependencyNode>> 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<String, List<org.apache.maven.shared.dependency.tree.DependencyNode>> realNodes, Set<ArtifactSpec> broken) { + private Dependency convert2(boolean root, org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter filter, Map<String, List<org.apache.maven.shared.dependency.tree.DependencyNode>> realNodes, Set<ArtifactSpec> broken) { List<Dependency> ch = new ArrayList<>(); List<org.apache.maven.shared.dependency.tree.DependencyNode> children = null; @@ -286,7 +286,7 @@ public class MavenDependenciesImplementation implements ProjectDependenciesImple } 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 @@ public class MavenDependenciesImplementation implements ProjectDependenciesImple } Scope s = scope(a); - if (!filter.accept(s, aspec)) { + if (!root && !filter.accept(s, aspec)) { return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
