Merge pull request #324 from shivam71/MoveRefactoring_Fix_Update1

Updated the patch for MoveRefactoringFix based on the netbeans PR review

Author: sid-srini

build.xml

@@ -58,7 +58,7 @@
             patches/7750.diff
             patches/7910.diff
             patches/7921.diff
-            patches/7923_draft.diff
+            patches/7923.diff
             patches/7926.diff
             patches/mvn-sh.diff
             patches/generate-dependencies.diff

patches/7923.diff

@@ -0,0 +1,24 @@
+diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
+index a72abd44ef..12acbc7081 100644
+--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
++++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
+@@ -420,6 +420,9 @@ public final class MoveRefactoring extends CodeRefactoring {
+         }
+ 
+         private static Project getSelectedProject(NamedPath selectedProject) {
++            if (selectedProject == null) {
++                return null;
++            }
+             try {
+                 String path = selectedProject.getPath();
+                 return path != null ? FileOwnerQuery.getOwner(Utils.fromUri(path)) : null;
+@@ -429,6 +432,9 @@ public final class MoveRefactoring extends CodeRefactoring {
+         }
+ 
+         private static FileObject getSelectedRoot(NamedPath selectedRoot) {
++            if (selectedRoot == null) {
++                return null;
++            }
+             try {
+                 String path = selectedRoot.getPath();
+                 return path != null ? Utils.fromUri(path) : null;