From 421122c2192704466cd2afa54f13733fb39582c4 Mon Sep 17 00:00:00 2001
From: Reema Taneja <32299405+rtaneja1@users.noreply.github.com>
Date: Tue, 26 Jun 2018 12:56:27 -0700
Subject: [PATCH] NETBEANS-892: Fix updation of unrelated files during refactor

---
 .../modules/refactoring/java/plugins/MoveClassTransformer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveClassTransformer.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveClassTransformer.java
index a295abf19ce1..cd7b618c94a0 100644
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveClassTransformer.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveClassTransformer.java
@@ -146,8 +146,6 @@ public Tree visitCompilationUnit(CompilationUnitTree node, Element p) {
             cut = make.CompilationUnit(cut.getPackageName(), imports, cut.getTypeDecls(), cut.getSourceFile());
         }
         
-        cut = GeneratorUtilities.get(workingCopy).importFQNs(cut);
-
         rewrite(node, cut);
         
         return result;
@@ -245,6 +243,7 @@ public Object visitIdentifier(IdentifierTree node, Element p) {
                     }
                     get.copyComments(origTree, newClass, true);
                     get.copyComments(origTree, newClass, false);
+                    newClass = get.importFQNs(newClass);
                     newClass = get.insertClassMember(node, newClass);
                     original2Translated.put(node, newClass);
                 }