pull up: as refactoring processor

java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java

@@ -24,12 +24,8 @@
  */
 package com.intellij.refactoring.memberPullUp;
 
-import com.intellij.history.LocalHistory;
-import com.intellij.history.LocalHistoryAction;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
@@ -43,12 +39,9 @@ import com.intellij.refactoring.classMembers.MemberInfoBase;
 import com.intellij.refactoring.lang.ElementsHandler;
 import com.intellij.refactoring.ui.ConflictsDialog;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
-import com.intellij.refactoring.util.DocCommentPolicy;
 import com.intellij.refactoring.util.RefactoringHierarchyUtil;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
 import com.intellij.refactoring.util.classMembers.MemberInfoStorage;
-import com.intellij.usageView.UsageViewUtil;
-import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 
@@ -145,44 +138,9 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
 
 
     dialog.show();
-
-    if (!dialog.isOK()) return;
-
-    CommandProcessor.getInstance().executeCommand(myProject, new Runnable() {
-      public void run() {
-        final Runnable action = new Runnable() {
-          public void run() {
-            doRefactoring(dialog);
-          }
-        };
-        ApplicationManager.getApplication().runWriteAction(action);
-      }
-    }, REFACTORING_NAME, null);
-
   }
 
 
-  private void doRefactoring(PullUpDialog dialog) {
-    LocalHistoryAction a = LocalHistory.startAction(myProject, getCommandName());
-    try {
-      try {
-        PullUpHelper helper = new PullUpHelper(mySubclass, dialog.getSuperClass(), dialog.getSelectedMemberInfos(),
-                                               new DocCommentPolicy(dialog.getJavaDocPolicy()));
-        helper.moveMembersToBase();
-        helper.moveFieldInitializations();
-      }
-      finally {
-        a.finish();
-      }
-    }
-    catch (IncorrectOperationException e) {
-      LOG.error(e);
-    }
-  }
-
-  private String getCommandName() {
-    return RefactoringBundle.message("pullUp.command", UsageViewUtil.getDescriptiveName(mySubclass));
-  }
 
   public boolean checkConflicts(PullUpDialog dialog) {
     final MemberInfo[] infos = dialog.getSelectedMemberInfos();

java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java

@@ -26,8 +26,8 @@ package com.intellij.refactoring.memberPullUp;
 
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.psi.*;
+import com.intellij.refactoring.BaseRefactoringProcessor;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
@@ -35,6 +35,8 @@ import com.intellij.refactoring.classMembers.MemberInfoChange;
 import com.intellij.refactoring.ui.ClassCellRenderer;
 import com.intellij.refactoring.ui.DocCommentPanel;
 import com.intellij.refactoring.ui.MemberSelectionPanel;
+import com.intellij.refactoring.ui.RefactoringDialog;
+import com.intellij.refactoring.util.DocCommentPolicy;
 import com.intellij.refactoring.util.RefactoringHierarchyUtil;
 import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
@@ -51,7 +53,7 @@ import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.List;
 
-public class PullUpDialog extends DialogWrapper {
+public class PullUpDialog extends RefactoringDialog {
   private final Callback myCallback;
   private MemberSelectionPanel myMemberSelectionPanel;
   private MyMemberInfoModel myMemberInfoModel;
@@ -174,9 +176,12 @@ public class PullUpDialog extends DialogWrapper {
     }*/
   }
 
-  protected void doOKAction() {
+  protected void doAction() {
     if (!myCallback.checkConflicts(this)) return;
     JavaRefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC = myJavaDocPanel.getPolicy();
+
+    invokeRefactoring(new PullUpHelper(myClass, getSuperClass(), getSelectedMemberInfos(),
+                                               new DocCommentPolicy(getJavaDocPolicy())));
     close(OK_EXIT_CODE);
   }
 

java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java

@@ -40,21 +40,28 @@ import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.refactoring.BaseRefactoringProcessor;
+import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.listeners.JavaRefactoringListenerManager;
 import com.intellij.refactoring.listeners.impl.JavaRefactoringListenerManagerImpl;
 import com.intellij.refactoring.util.DocCommentPolicy;
 import com.intellij.refactoring.util.RefactoringHierarchyUtil;
+import com.intellij.refactoring.util.RefactoringUIUtil;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.refactoring.util.classMembers.ClassMemberReferencesVisitor;
 import com.intellij.refactoring.util.classMembers.MemberInfo;
+import com.intellij.usageView.UsageInfo;
+import com.intellij.usageView.UsageViewDescriptor;
+import com.intellij.usageView.UsageViewUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.VisibilityUtil;
 import com.intellij.util.containers.HashMap;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
-public class PullUpHelper {
+public class PullUpHelper extends BaseRefactoringProcessor{
   private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.memberPullUp.PullUpHelper");
   private final PsiClass mySourceClass;
   private final PsiClass myTargetSuperClass;
@@ -67,6 +74,7 @@ public class PullUpHelper {
 
   public PullUpHelper(PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove,
                       DocCommentPolicy javaDocPolicy) {
+    super(sourceClass.getProject());
     mySourceClass = sourceClass;
     myTargetSuperClass = targetSuperClass;
     myMembersToMove = membersToMove;
@@ -75,6 +83,27 @@ public class PullUpHelper {
     myManager = mySourceClass.getManager();
   }
 
+  protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages) {
+    return new PullUpUsageViewDescriptor();
+  }
+
+  @NotNull
+  protected UsageInfo[] findUsages() {
+    return new UsageInfo[0];
+  }
+
+  protected void refreshElements(PsiElement[] elements) {
+  }
+
+  protected void performRefactoring(UsageInfo[] usages) {
+    moveMembersToBase();
+    moveFieldInitializations();
+  }
+
+  protected String getCommandName() {
+    return RefactoringBundle.message("pullUp.command", UsageViewUtil.getDescriptiveName(mySourceClass));
+  }
+
   public void moveMembersToBase()
           throws IncorrectOperationException {
     final HashSet<PsiMember> movedMembers = new HashSet<PsiMember>();
@@ -743,4 +772,22 @@ public class PullUpHelper {
     return false;
   }
 
+  private class PullUpUsageViewDescriptor implements UsageViewDescriptor {
+    public String getProcessedElementsHeader() {
+      return "Pull up members from";
+    }
+
+    @NotNull
+    public PsiElement[] getElements() {
+      return new PsiElement[]{mySourceClass};
+    }
+
+    public String getCodeReferencesText(int usagesCount, int filesCount) {
+      return "Class to pull up members to \"" + RefactoringUIUtil.getDescription(myTargetSuperClass, true) + "\"";
+    }
+
+    public String getCommentReferencesText(int usagesCount, int filesCount) {
+      return null;
+    }
+  }
 }