From d0f14caf37eca0bf039470844219cf56975e512d Mon Sep 17 00:00:00 2001
From: Michael Bien <mbien42@gmail.com>
Date: Wed, 7 Oct 2026 00:20:32 +0200
Subject: [PATCH] Fix NPE during form designer component rename

component must be in a guarded section for this to happen

regression since 79aacdfbd which likely meant to only remove the
last method parameter instead of two due to a missing space.
---
 .../java/plugins/RenameRefactoringPlugin.java          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameRefactoringPlugin.java
index f0d96c8656da..6344a1482b89 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/RenameRefactoringPlugin.java
@@ -53,7 +53,7 @@
  */
 public class RenameRefactoringPlugin extends JavaRefactoringPlugin {
     
-    private Set<ElementHandle<ExecutableElement>> allMethods = new HashSet<ElementHandle<ExecutableElement>>();
+    private Set<ElementHandle<ExecutableElement>> allMethods = new HashSet<>();
     private Set<TreePathHandle> recordLinkedDeclarations = new HashSet<>();
     private boolean doCheckName = true;
     private Integer overriddenByMethodsCount = null;
@@ -92,9 +92,7 @@ public void run(CompilationController co) throws Exception {
                         }
                     }
                 }, false);
-            } catch (IllegalArgumentException ex) {
-                ex.printStackTrace();
-            } catch (IOException ex) {
+            } catch (IllegalArgumentException | IOException ex) {
                 ex.printStackTrace();
             }
         }
@@ -610,7 +608,7 @@ public Problem prepare(RefactoringElementsBag elements) {
         Set<FileObject> a = getRelevantFiles();
         fireProgressListenerStart(AbstractRefactoring.PREPARE, a.size());
         TransformTask transform = new TransformTask(new RenameTransformer(treePathHandle, docTreePathHandle, refactoring, allMethods, recordLinkedDeclarations, refactoring.isSearchInComments()), treePathHandle != null && treePathHandle.getKind() == Tree.Kind.LABELED_STATEMENT ? null : treePathHandle);
-        Problem problem = createAndAddElements(a, transform, elements, null);
+        Problem problem = createAndAddElements(a, transform, elements, refactoring);
         fireProgressListenerStop();
         return problem;
     }
@@ -618,9 +616,7 @@ public Problem prepare(RefactoringElementsBag elements) {
     private Problem willOverride(ExecutableElement method, String name, Problem problem, CompilationInfo info) {
         boolean isStatic = method.getModifiers().contains(Modifier.STATIC);
         TypeElement jc = (TypeElement) method.getEnclosingElement();
-        LinkedList supertypes = new LinkedList();
         
-        ElementUtilities ut = info.getElementUtilities();
         Elements elements = info.getElements();
         ExecutableElement m = null;