You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2021/04/02 19:14:25 UTC
[netbeans] branch master updated: [NETBEANS:4447]:Fixed
NullPointerException while computing switch expression conversion and
Formatting Issue
This is an automated email from the ASF dual-hosted git repository.
geertjan 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 e8e8fc5 [NETBEANS:4447]:Fixed NullPointerException while computing switch expression conversion and Formatting Issue
new 5a9c949 Merge pull request #2570 from Mohan-Sarilla/netbeans-4447
e8e8fc5 is described below
commit e8e8fc5c8f62cc9ee8344aea8b2b375181ea13af
Author: Mohan-Sarilla <sa...@oracle.com>
AuthorDate: Mon Nov 30 13:16:40 2020 +0530
[NETBEANS:4447]:Fixed NullPointerException while computing switch expression conversion and Formatting Issue
---
.../src/org/netbeans/modules/java/hints/errors/Utilities.java | 6 ++++--
.../src/org/netbeans/modules/java/source/save/CasualDiff.java | 7 +++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
index 1b1e34a..99c9364 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/Utilities.java
@@ -3137,7 +3137,8 @@ public class Utilities {
}
break;
} else {
- if (leftTreeName != null && leftTreeName.contentEquals(getLeftTreeName(statements.get(0)))) {
+ Name exprTree = getLeftTreeName(statements.get(0));
+ if (leftTreeName != null && exprTree != null && leftTreeName.contentEquals(exprTree)) {
break;
} else {
return false;
@@ -3155,7 +3156,8 @@ public class Utilities {
}
firstCase = false;
}
- if (leftTreeName != null && leftTreeName.contentEquals(getLeftTreeName(statements.get(0)))) {
+ Name exprTree = getLeftTreeName(statements.get(0));
+ if (leftTreeName != null && exprTree != null && leftTreeName.contentEquals(exprTree)) {
break;
} else {
return false;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
index b26570f..ecb26f0 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
@@ -1900,6 +1900,13 @@ public class CasualDiff {
PositionEstimator est = EstimatorFactory.cases(oldT.getCases(), newT.getCases(), diffContext);
localPointer = diffList(oldT.cases, newT.cases, localPointer, est, Measure.MEMBER, printer);
+ List<JCCase> cases = newT.cases;
+ if (cases.size() != 0) {
+ String caseKind = String.valueOf(CasualDiff.getCaseKind(cases.get(0)));
+ if (caseKind.equals("RULE")) { // NOI18N
+ printer.newline();
+ }
+ }
copyTo(localPointer, bounds[1]);
return bounds[1];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists