This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c9b8c2a [NETBEANS-405] Avoiding use of internal classes, searching
boot classpath to detect JDK modules.
c9b8c2a is described below
commit c9b8c2a428285bff830208fda132c9ffa8fe64ca
Author: Jan Lahoda <[email protected]>
AuthorDate: Sun Feb 25 08:57:33 2018 +0100
[NETBEANS-405] Avoiding use of internal classes, searching boot classpath
to detect JDK modules.
---
.../java/module/graph/DependencyCalculator.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git
a/java.module.graph/src/org/netbeans/modules/java/module/graph/DependencyCalculator.java
b/java.module.graph/src/org/netbeans/modules/java/module/graph/DependencyCalculator.java
index 1da745d..e13cc4e 100644
---
a/java.module.graph/src/org/netbeans/modules/java/module/graph/DependencyCalculator.java
+++
b/java.module.graph/src/org/netbeans/modules/java/module/graph/DependencyCalculator.java
@@ -20,10 +20,7 @@ package org.netbeans.modules.java.module.graph;
import com.sun.source.tree.Tree;
import com.sun.source.util.TreePath;
-import com.sun.tools.javac.code.Symbol;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -156,19 +153,11 @@ final class DependencyCalculator {
}
private boolean isJDK(final ModuleElement me, ClasspathInfo cpinfo) {
- boolean isJDK = false;
- Symbol.ClassSymbol mi = ((Symbol.ModuleSymbol) me).module_info;
- JavaFileObject cf = mi != null ? mi.classfile : null;
- if(cf != null) {
- URI uri = cf.toUri();
- ClassPath cp = cpinfo.getClassPath(ClasspathInfo.PathKind.BOOT);
- try {
- isJDK =
cp.findOwnerRoot(URLMapper.findFileObject(uri.toURL())) != null;
- } catch (MalformedURLException ex) {
- Exceptions.printStackTrace(ex);
- }
+ for (FileObject root :
cpinfo.getClassPath(ClasspathInfo.PathKind.BOOT).getRoots()) {
+ if (root.getNameExt().contentEquals(me.getQualifiedName()))
+ return true;
}
- return isJDK;
+ return false;
}
Collection<DependencyEdge>
collectTransitiveDependencies(Collection<DependencyEdge> deps) {
--
To stop receiving notification emails like this one, please contact
[email protected].
---------------------------------------------------------------------
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
