[netbeans] branch delivery updated: Fix Gradle version change in wrapper.properties

[neilcsmith]

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 aa5755a61c Fix Gradle version change in wrapper.properties
     new 5e712c89f2 Merge pull request #6589 from 
lkishalmi/fix-gradle-version-change-in-wrapper
aa5755a61c is described below

commit aa5755a61c8eb7bfc773a664ef4ddb14a1513b58
Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com>
AuthorDate: Thu Oct 19 11:18:15 2023 +0200

    Fix Gradle version change in wrapper.properties
---
 .../modules/gradle/execute/GradleDistributionProviderImpl.java        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git 
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
 
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
index be671794de..2b01040093 100644
--- 
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
+++ 
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
@@ -74,7 +74,6 @@ public class GradleDistributionProviderImpl implements 
GradleDistributionProvide
     final NbGradleProjectImpl project;
     private GradleDistribution dist;
     private final PropertyChangeListener pcl;
-    private URI distributionURI;
 
     public GradleDistributionProviderImpl(Project project) {
         this.project = (NbGradleProjectImpl) project;
@@ -83,8 +82,7 @@ public class GradleDistributionProviderImpl implements 
GradleDistributionProvide
                 URI uri = (URI) evt.getNewValue();
                 if ((uri != null) && (uri.getPath() != null) && 
uri.getPath().endsWith(GradleFiles.WRAPPER_PROPERTIES)) {
                     URI newDistURI = getWrapperDistributionURI();
-                    if (GradleSettings.getDefault().isWrapperPreferred() && 
(distributionURI != null) && !Objects.equal(distributionURI, newDistURI)) {
-                        distributionURI = newDistURI;
+                    if (GradleSettings.getDefault().isWrapperPreferred() && 
(dist != null) && !Objects.equal(dist.getDistributionURI(), newDistURI)) {
                         distributionChanged();
                     }
                 }


---------------------------------------------------------------------
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