This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 5a2c5a918d revert rushed unbalanced-hint fix (#4421).
new 43e49de3c6 Merge pull request #4580 from mbien/revert-4421
5a2c5a918d is described below
commit 5a2c5a918dafcb9109f463b4d9df3f7a827eb4f9
Author: Michael Bien <[email protected]>
AuthorDate: Fri Sep 2 22:13:33 2022 +0200
revert rushed unbalanced-hint fix (#4421).
- fix for #4402 caused #4545
- partial revert, tests are commented out, update to READ_METHODS
Set is kept
---
.../src/org/netbeans/modules/java/hints/bugs/Unbalanced.java | 6 ++----
.../src/org/netbeans/modules/java/hints/bugs/UnbalancedTest.java | 8 ++++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unbalanced.java
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unbalanced.java
index 51829b5f13..01f969084f 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unbalanced.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unbalanced.java
@@ -152,7 +152,7 @@ public class Unbalanced {
if (secondAccess != null) {
record(ctx.getInfo(), var, secondAccess);
}
- } else if (!var.getModifiers().contains(Modifier.FINAL)) {
+ } else {
record(ctx.getInfo(), var, State.WRITE, State.READ);
}
@@ -254,9 +254,7 @@ public class Unbalanced {
}
}
- if (!var.getModifiers().contains(Modifier.FINAL)) {
- record(ctx.getInfo(), var, State.WRITE, State.READ);
- }
+ record(ctx.getInfo(), var, State.WRITE, State.READ);
return null;
}
diff --git
a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnbalancedTest.java
b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnbalancedTest.java
index 70e008381a..fbd11e3255 100644
---
a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnbalancedTest.java
+++
b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnbalancedTest.java
@@ -67,7 +67,7 @@ public class UnbalancedTest extends NbTestCase {
.run(Unbalanced.Array.class)
.assertContainsWarnings("2:19-2:22:verifier:ERR_UnbalancedArrayREAD arr");
}
-
+/* TODO: fails, see 4402
public void testArrayReadOnly3() throws Exception {
HintTest
.create()
@@ -80,7 +80,7 @@ public class UnbalancedTest extends NbTestCase {
.run(Unbalanced.Array.class)
.assertContainsWarnings("2:25-2:28:verifier:ERR_UnbalancedArrayREAD arr");
}
-
+*/
public void testArrayNeg1() throws Exception {
HintTest
.create()
@@ -324,7 +324,7 @@ com.sun.tools.javac.tree.JCTree$JCCompilationUnit@40d0726d
.run(Unbalanced.Collection.class)
.assertContainsWarnings("2:35-2:39:verifier:ERR_UnbalancedCollectionREAD coll");
}
-
+/* TODO: fails, see 4402
public void testCollectionReadOnly4() throws Exception {
HintTest
.create()
@@ -337,7 +337,7 @@ com.sun.tools.javac.tree.JCTree$JCCompilationUnit@40d0726d
.run(Unbalanced.Collection.class)
.assertContainsWarnings("2:41-2:45:verifier:ERR_UnbalancedCollectionREAD coll");
}
-
+*/
public void testMapReadOnly1() throws Exception {
HintTest
.create()
---------------------------------------------------------------------
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
