1.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringActionsProvider.java	Fri Oct 26 19:16:09 2007 +0000
     1.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringActionsProvider.java	Sat Oct 27 15:49:33 2007 +0000
     1.3 @@ -112,7 +112,8 @@
     1.4                      return new FacesRenameRefactoringUI(fileObjects[0], newName);
     1.5                  }                
     1.6          	};
     1.7 -        	FacesRefactoringUtils.invokeAfterScanFinished(task, (String) RefactoringActionsFactory.renameAction().getValue(Action.NAME));
     1.8 +        	FacesRefactoringUtils.invokeAfterScanFinished(task, 
     1.9 +        	        getActionName(RefactoringActionsFactory.renameAction()));
    1.10          }
    1.11      }
    1.12      
    1.13 @@ -173,7 +174,8 @@
    1.14                  }
    1.15                  
    1.16              };
    1.17 -            FacesRefactoringUtils.invokeAfterScanFinished(task, (String) RefactoringActionsFactory.moveAction().getValue(Action.NAME));
    1.18 +            FacesRefactoringUtils.invokeAfterScanFinished(task, 
    1.19 +                    getActionName(RefactoringActionsFactory.moveAction()));
    1.20          }
    1.21      }
    1.22      
    1.23 @@ -235,4 +237,10 @@
    1.24          protected abstract RefactoringUI createRefactoringUI(FileObject[] selectedElement);
    1.25      }    
    1.26  
    1.27 +    static String getActionName(Action action) {
    1.28 +        String arg = (String) action.getValue(Action.NAME);
    1.29 +        arg = org.openide.util.Utilities.replaceString(arg, "&", ""); // NOI18N
    1.30 +        return org.openide.util.Utilities.replaceString(arg, "...", ""); // NOI18N
    1.31 +    }
    1.32 +    
    1.33  }

     2.1 --- a/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringUtils.java	Fri Oct 26 19:16:09 2007 +0000
     2.2 +++ b/visualweb.insync/src/org/netbeans/modules/visualweb/insync/faces/refactoring/FacesRefactoringUtils.java	Sat Oct 27 15:49:33 2007 +0000
     2.3 @@ -867,7 +867,9 @@
     2.4              SwingUtilities.invokeLater(new Runnable() {
     2.5                  public void run() {
     2.6                      if (!cancel) {
     2.7 -                        waitDialog.setVisible(false);
     2.8 +                        if (waitDialog != null) {
     2.9 +                            waitDialog.setVisible(false);
    2.10 +                        }
    2.11                          action.run();
    2.12                      }
    2.13                  }