This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 1529976 [NETBEANS-5783] Make sure that getDisplayName() is non null
in Gradle Projects.
new 5697c3c Merge pull request #3307 from lkishalmi/NETBEANS-5783
1529976 is described below
commit 152997693d417d6bd16985a6e54dfa0515618126
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Sun Nov 7 08:35:01 2021 -0800
[NETBEANS-5783] Make sure that getDisplayName() is non null in Gradle
Projects.
---
extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java | 4 ++++
.../org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
b/extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
index 46e4e86..9789169 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/queries/Info.java
@@ -69,7 +69,11 @@ public final class Info implements ProjectInformation,
PropertyChangeListener {
@Override
public String getName() {
+ final NbGradleProject nb = NbGradleProject.get(project);
GradleBaseProject prj = GradleBaseProject.get(project);
+ if (!nb.isGradleProjectLoaded() || prj == null || prj.getName() ==
null) {
+ return project.getProjectDirectory().getNameExt();
+ }
String ret = prj.isRoot() ? prj.getName() : prj.getRootDir().getName()
+ prj.getPath();
return ret;
diff --git
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
index 2a948a7..8a3bfa2 100644
---
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
+++
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/AbstractGradleProjectTestCase.java
@@ -87,6 +87,11 @@ public class AbstractGradleProjectTestCase extends
NbTestCase {
}).get();
}
+ protected void dumpProject(Project project){
+ NbGradleProjectImpl impl = (NbGradleProjectImpl) project;
+ impl.dumpProject();
+ }
+
protected FileObject createGradleProject(String path, String buildScript,
String settingsScript) throws IOException {
FileObject ret = FileUtil.toFileObject(getWorkDir());
if (path != 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
