[incubator-netbeans] branch master updated: [NETBEANS-1386]: Fixing handling of non-modularized repositories in project.ActionProviderImpl.

[jlahoda]

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 9a14489  [NETBEANS-1386]: Fixing handling of non-modularized 
repositories in project.ActionProviderImpl.
9a14489 is described below

commit 9a144897ed40f9091df133d6be05e0c4078c9392
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Tue Oct 9 07:57:44 2018 +0200

    [NETBEANS-1386]: Fixing handling of non-modularized repositories in 
project.ActionProviderImpl.
---
 .../netbeans/modules/java/openjdk/project/ActionProviderImpl.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 9f71140..fae5bb8 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 class ActionProviderImpl implements ActionProvider {
 
         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 class ActionProviderImpl implements ActionProvider {
             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);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

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