This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 73fe19791595c29d5b0a8e763d0bffe604eeaf33
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Wed Feb 2 11:28:31 2022 +0100
Retain project problems from gradle execution.
---
.../netbeans/modules/gradle/NbGradleProjectImpl.java | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
index 7901ef2..a09b799 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
@@ -402,7 +402,20 @@ public final class NbGradleProjectImpl implements Project {
}
loadedProjectSerial = s;
this.attemptedQuality = aim;
- if (project != null && !force &&
project.getQuality().atLeast(prj.getQuality())) {
+
+ boolean replace = project == null;
+ if (project != null) {
+ if (prj.getQuality().betterThan(project.getQuality())) {
+ replace = true;
+ } else if (
+ project.getQuality().equals(prj.getQuality()) &&
+ !project.getProblems().equals(prj.getProblems()) &&
+ !prj.getProblems().isEmpty()) {
+ // exception: if the new project is the same quality
fallback, but contains (different) problem info, use it
+ replace = true;
+ }
+ }
+ if (!replace) {
// avoid replacing a project when nothing has changed.
LOG.log(Level.FINER, "Current project {1} sufficient for
attempted quality {0}", new Object[] { this.project, aim });
return CompletableFuture.completedFuture(this.project);
@@ -495,7 +508,7 @@ public final class NbGradleProjectImpl implements Project {
GradleProject getPrimedProject() {
GradleProject gp = projectWithQuality(null, EVALUATED, false, false);
- return !(gp.getQuality().notBetterThan(EVALUATED) ||
!gp.getProblems().isEmpty()) ? gp : null;
+ return gp.getQuality().betterThan(EVALUATED) ? gp : null;
}
/**
---------------------------------------------------------------------
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
