[GitHub] jlahoda closed pull request #954: [NETBEANS-1386]: Fixing handling of non-modularized repositories in p…

[GitBox <gi...@apache.org>]

jlahoda closed pull request #954: [NETBEANS-1386]: Fixing handling of non-modularized repositories in p…
URL: https://github.com/apache/incubator-netbeans/pull/954
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ActionProviderImpl.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ActionProviderImpl.java
index 9f71140a9b..fae5bb87ee 100644
--- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ActionProviderImpl.java
+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ActionProviderImpl.java
@@ -112,7 +112,7 @@ public ActionProviderImpl(JDKProject project) {
 
         genericScript = FileUtil.toFileObject(scriptFile);
 
-        if (project.moduleRepository.isConsolidatedRepo()) {
+        if (project.currentModule != null && project.moduleRepository.isConsolidatedRepo()) {
             String repoName = ShortcutUtils.getDefault().inferLegacyRepository(project);
             File fastBuild = InstalledFileLocator.getDefault().locate("scripts/build-" + repoName + "-consol.xml", "org.netbeans.modules.java.openjdk.project", false);
             if (fastBuild != null && ShortcutUtils.getDefault().shouldUseCustomBuild(repoName, FileUtil.getRelativePath(repo, project.getProjectDirectory()))) {
@@ -185,7 +185,10 @@ public void invokeAction(String command, Lookup context) throws IllegalArgumentE
             command = COMMAND_BUILD_FAST; //XXX: should only do this if genericScript supports it
         }
         Properties props = new Properties();
-        props.put("basedir", FileUtil.toFile(scriptFO == genericScript ? project.moduleRepository.getJDKRoot() : repository).getAbsolutePath());
+        FileObject basedirFO = project.currentModule != null ? scriptFO == genericScript ? project.moduleRepository.getJDKRoot()
+                                                                                         : repository
+                                                             : repository.getParent();
+        props.put("basedir", FileUtil.toFile(basedirFO).getAbsolutePath());
         props.put("CONF", project.configurations.getActiveConfiguration().getLocation().getName());
         props.put("nb.jdk.project.target.java.home", BuildUtils.findTargetJavaHome(project.getProjectDirectory()).getAbsolutePath());
         RootKind kind = getKind(context);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists