[netbeans] branch master updated: [NETBEANS-4400] Added support for renaming RECORD name using refactoring (#2164)

[arusinha]

This is an automated email from the ASF dual-hosted git repository.

arusinha 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 8469268  [NETBEANS-4400] Added support for renaming RECORD name using 
refactoring (#2164)
8469268 is described below

commit 8469268155211b13baf2767ab7d1c7aefb7bc5d5
Author: Akhilesh Singh <akhilesh.s.si...@oracle.com>
AuthorDate: Sun Jun 28 17:08:14 2020 +0530

    [NETBEANS-4400] Added support for renaming RECORD name using refactoring 
(#2164)
    
    * [NETBEANS-4400] Added support for renaming RECORD name using refactoring
    
    * [NETBEANS-4400] Addressed code review comments
---
 .../java.source.base/src/org/netbeans/api/java/source/TreeMaker.java | 5 +++--
 .../src/org/netbeans/modules/java/source/TreeShims.java              | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java 
b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
index 78710dc..7e2baa0 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
@@ -73,6 +73,7 @@ import org.netbeans.api.lexer.TokenHierarchy;
 import org.netbeans.api.lexer.TokenSequence;
 
 import org.netbeans.api.java.lexer.JavaTokenId;
+import org.netbeans.modules.java.source.TreeShims;
 
 import org.netbeans.modules.java.source.builder.ASTService;
 import org.netbeans.modules.java.source.query.CommentSet;
@@ -2869,8 +2870,8 @@ public final class TreeMaker {
         // todo (#pf): Shouldn't here be check that names are not the same?
         // i.e. node label == aLabel? -- every case branch has to check itself
         // This will improve performance, no change was done by API user.
-        Tree.Kind kind = node.getKind();
-
+        Tree.Kind kind = TreeShims.isRecord(node) ? Kind.CLASS : 
node.getKind();
+       
         switch (kind) {
             case BREAK: {
                 BreakTree t = (BreakTree) node;
diff --git 
a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java 
b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
index 11b1c04..5e7b042 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
@@ -199,6 +199,10 @@ public class TreeShims {
     public static boolean isRecord(Element el) {
         return el != null && "RECORD".equals(el.getKind().name());
     }
+    
+    public static<N extends Tree> boolean isRecord(final N node) {
+        return node != null && TreeShims.RECORD.equals(node.getKind().name());
+    }
 
     public static boolean isRecordComponent(Element el) {
         return el != null && "RECORD_COMPONENT".equals(el.getKind().name());


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