Skip to content

Commit bc3e245

Browse files
committed
Updated the patch based on the netbeans PR review
1 parent b3e380f commit bc3e245

File tree

3 files changed

+25
-37
lines changed

3 files changed

+25
-37
lines changed

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
patches/7750.diff
5959
patches/7910.diff
6060
patches/7921.diff
61-
patches/7923_draft.diff
61+
patches/7923.diff
6262
patches/7926.diff
6363
patches/mvn-sh.diff
6464
patches/generate-dependencies.diff

patches/7923.diff

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
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
2+
index a72abd44ef..12acbc7081 100644
3+
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
4+
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/refactoring/MoveRefactoring.java
5+
@@ -420,6 +420,9 @@ public final class MoveRefactoring extends CodeRefactoring {
6+
}
7+
8+
private static Project getSelectedProject(NamedPath selectedProject) {
9+
+ if (selectedProject == null) {
10+
+ return null;
11+
+ }
12+
try {
13+
String path = selectedProject.getPath();
14+
return path != null ? FileOwnerQuery.getOwner(Utils.fromUri(path)) : null;
15+
@@ -429,6 +432,9 @@ public final class MoveRefactoring extends CodeRefactoring {
16+
}
17+
18+
private static FileObject getSelectedRoot(NamedPath selectedRoot) {
19+
+ if (selectedRoot == null) {
20+
+ return null;
21+
+ }
22+
try {
23+
String path = selectedRoot.getPath();
24+
return path != null ? Utils.fromUri(path) : null;

patches/7923_draft.diff

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)