From 42bc1846c4a547b73de2b46b6fd13fd8d20ed28e Mon Sep 17 00:00:00 2001 From: Kirill Safonov Date: Fri, 11 Sep 2009 15:56:11 +0400 Subject: [PATCH] generify: JavaDocPolicy -> DocCommentPolicy --- .../ExtractInterfaceDialog.java | 6 +++--- .../ExtractInterfaceHandler.java | 10 +++++----- .../ExtractInterfaceProcessor.java | 4 ++-- .../ExtractSuperBaseDialog.java | 6 +++--- .../ExtractSuperBaseProcessor.java | 6 +++--- .../ExtractSuperClassProcessor.java | 4 ++-- .../ExtractSuperClassUtil.java | 4 ++-- .../ExtractSuperclassDialog.java | 4 ++-- .../ExtractSuperclassHandler.java | 6 +++--- .../InlineSuperClassRefactoringProcessor.java | 4 ++-- .../memberPullUp/JavaPullUpHandler.java | 4 ++-- .../refactoring/memberPullUp/PullUpDialog.java | 5 +++-- .../refactoring/memberPullUp/PullUpHelper.java | 6 +++--- .../memberPushDown/PushDownDialog.java | 10 +++++----- .../memberPushDown/PushDownProcessor.java | 6 +++--- .../refactoring/ExtractSuperClassTest.java | 4 ++-- .../com/intellij/refactoring/PullUpTest.java | 4 ++-- .../refactoring/ui/DocCommentPanel.java | 18 +++++++++--------- .../refactoring/util/DocCommentPolicy.java | 12 ++++++------ .../com/intellij/refactoring/PushDownTest.java | 7 ++++--- 20 files changed, 66 insertions(+), 64 deletions(-) rename java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java => platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java (84%) rename java/java-impl/src/com/intellij/refactoring/util/JavaDocPolicy.java => platform/lang-impl/src/com/intellij/refactoring/util/DocCommentPolicy.java (69%) diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java index 4bf06e690f43..80b14abfbf07 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java @@ -11,7 +11,7 @@ import com.intellij.refactoring.classMembers.MemberInfoBase; import com.intellij.refactoring.extractSuperclass.ExtractSuperBaseDialog; import com.intellij.refactoring.extractSuperclass.ExtractSuperBaseProcessor; import com.intellij.refactoring.ui.MemberSelectionPanel; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import javax.swing.*; @@ -191,11 +191,11 @@ class ExtractInterfaceDialog extends ExtractSuperBaseDialog { protected ExtractSuperBaseProcessor createProcessor() { return new ExtractInterfaceProcessor(myProject, false, getTargetDirectory(), getExtractedSuperName(), mySourceClass, getSelectedMembers(), - new JavaDocPolicy(getJavaDocPolicy())); + new DocCommentPolicy(getJavaDocPolicy())); } @Override protected String getHelpId() { return HelpID.EXTRACT_INTERFACE; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java index 5b634f2bcc09..1bb22c32b850 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java @@ -17,7 +17,7 @@ import com.intellij.refactoring.extractSuperclass.ExtractSuperClassUtil; import com.intellij.refactoring.lang.ElementsHandler; import com.intellij.refactoring.memberPullUp.PullUpHelper; import com.intellij.refactoring.util.CommonRefactoringUtil; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; @@ -35,7 +35,7 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen private String myInterfaceName; private MemberInfo[] mySelectedMembers; private PsiDirectory myTargetDir; - private JavaDocPolicy myJavaDocPolicy; + private DocCommentPolicy myJavaDocPolicy; public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) { int offset = editor.getCaretModel().getOffset(); @@ -75,7 +75,7 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen myInterfaceName = dialog.getExtractedSuperName(); mySelectedMembers = dialog.getSelectedMembers(); myTargetDir = dialog.getTargetDirectory(); - myJavaDocPolicy = new JavaDocPolicy(dialog.getJavaDocPolicy()); + myJavaDocPolicy = new DocCommentPolicy(dialog.getJavaDocPolicy()); try { doRefactoring(); } @@ -109,7 +109,7 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen PsiClass aClass, String interfaceName, MemberInfo[] selectedMembers, - JavaDocPolicy javaDocPolicy) throws IncorrectOperationException { + DocCommentPolicy javaDocPolicy) throws IncorrectOperationException { PsiClass anInterface = JavaDirectoryService.getInstance().createInterface(targetDir, interfaceName); PsiJavaCodeReferenceElement ref = ExtractSuperClassUtil.createExtendingReference(anInterface, aClass, selectedMembers); final PsiReferenceList referenceList = aClass.isInterface() ? aClass.getExtendsList() : aClass.getImplementsList(); @@ -127,4 +127,4 @@ public class ExtractInterfaceHandler implements RefactoringActionHandler, Elemen public boolean isEnabledOnElements(PsiElement[] elements) { return elements.length == 1 && elements[0] instanceof PsiClass; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java index 28d4f111c047..9530114662d6 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java @@ -3,7 +3,7 @@ package com.intellij.refactoring.extractInterface; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.refactoring.extractSuperclass.ExtractSuperBaseProcessor; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.util.IncorrectOperationException; @@ -17,7 +17,7 @@ public class ExtractInterfaceProcessor extends ExtractSuperBaseProcessor { String newClassName, PsiClass aClass, MemberInfo[] memberInfos, - JavaDocPolicy javaDocPolicy) { + DocCommentPolicy javaDocPolicy) { super(project, replaceInstanceOf, targetDirectory, newClassName, aClass, memberInfos, javaDocPolicy); } diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java index 49d82831a95b..e5515ef2697a 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java @@ -10,7 +10,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.refactoring.memberPullUp.JavaDocPanel; +import com.intellij.refactoring.ui.DocCommentPanel; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringMessageUtil; @@ -39,7 +39,7 @@ public abstract class ExtractSuperBaseDialog extends RefactoringDialog { protected JTextField mySourceClassField; protected JTextField myExtractedSuperNameField; protected ReferenceEditorWithBrowseButton myPackageNameField; - protected JavaDocPanel myJavaDocPanel; + protected DocCommentPanel myJavaDocPanel; public ExtractSuperBaseDialog(Project project, PsiClass sourceClass, List members, String refactoringName) { @@ -59,7 +59,7 @@ public abstract class ExtractSuperBaseDialog extends RefactoringDialog { initSourceClassField(); myExtractedSuperNameField = new JTextField(); - myJavaDocPanel = new JavaDocPanel(getJavaDocPanelName()); + myJavaDocPanel = new DocCommentPanel(getJavaDocPanelName()); myJavaDocPanel.setPolicy(getJavaDocPolicySetting()); super.init(); diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java index 0298900533b2..95a8b5ed9b90 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java @@ -12,7 +12,7 @@ import com.intellij.psi.util.MethodSignatureUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.turnRefsToSuper.TurnRefsToSuperProcessorBase; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; @@ -31,14 +31,14 @@ public abstract class ExtractSuperBaseProcessor extends TurnRefsToSuperProcessor protected PsiDirectory myTargetDirectory; protected final String myNewClassName; protected MemberInfo[] myMemberInfos; - protected final JavaDocPolicy myJavaDocPolicy; + protected final DocCommentPolicy myJavaDocPolicy; public ExtractSuperBaseProcessor(Project project, boolean replaceInstanceOf, PsiDirectory targetDirectory, String newClassName, - PsiClass aClass, MemberInfo[] memberInfos, JavaDocPolicy javaDocPolicy) { + PsiClass aClass, MemberInfo[] memberInfos, DocCommentPolicy javaDocPolicy) { super(project, replaceInstanceOf, newClassName); myTargetDirectory = targetDirectory; myNewClassName = newClassName; diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java index c226d3fc36b5..638943e36b99 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java @@ -2,7 +2,7 @@ package com.intellij.refactoring.extractSuperclass; import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.util.IncorrectOperationException; @@ -13,7 +13,7 @@ public class ExtractSuperClassProcessor extends ExtractSuperBaseProcessor { public ExtractSuperClassProcessor(Project project, PsiDirectory targetDirectory, String newClassName, PsiClass aClass, MemberInfo[] memberInfos, boolean replaceInstanceOf, - JavaDocPolicy javaDocPolicy) { + DocCommentPolicy javaDocPolicy) { super(project, replaceInstanceOf, targetDirectory, newClassName, aClass, memberInfos, javaDocPolicy); } diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java index 327713fe392a..b2e9a8c8153e 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java @@ -8,7 +8,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.MethodSignature; import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.memberPullUp.PullUpHelper; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.util.IncorrectOperationException; @@ -29,7 +29,7 @@ public class ExtractSuperClassUtil { final String superclassName, final PsiClass subclass, final MemberInfo[] selectedMemberInfos, - final JavaDocPolicy javaDocPolicy) + final DocCommentPolicy javaDocPolicy) throws IncorrectOperationException { PsiClass superclass = JavaDirectoryService.getInstance().createClass(targetDirectory, superclassName); final PsiModifierList superClassModifierList = superclass.getModifierList(); diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java index 9fcfea5f6d22..4054ae20e48f 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java @@ -13,7 +13,7 @@ import com.intellij.refactoring.classMembers.MemberInfoChange; import com.intellij.refactoring.classMembers.MemberInfoModel; import com.intellij.refactoring.memberPullUp.PullUpHelper; import com.intellij.refactoring.ui.MemberSelectionPanel; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.refactoring.util.classMembers.UsesAndInterfacesDependencyMemberInfoModel; @@ -173,7 +173,7 @@ class ExtractSuperclassDialog extends ExtractSuperBaseDialog { protected ExtractSuperBaseProcessor createProcessor() { return new ExtractSuperClassProcessor(myProject, getTargetDirectory(), getExtractedSuperName(), mySourceClass, getSelectedMemberInfos(), false, - new JavaDocPolicy(getJavaDocPolicy())); + new DocCommentPolicy(getJavaDocPolicy())); } @Override diff --git a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java index 0751df7799e5..442c9431a9f4 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java @@ -18,12 +18,12 @@ import com.intellij.psi.*; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.refactoring.lang.ElementsHandler; import com.intellij.refactoring.extractInterface.ExtractClassUtil; +import com.intellij.refactoring.lang.ElementsHandler; import com.intellij.refactoring.memberPullUp.PullUpConflictsUtil; import com.intellij.refactoring.ui.ConflictsDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; @@ -130,7 +130,7 @@ public class ExtractSuperclassHandler implements RefactoringActionHandler, Extra final String superclassName = dialog.getExtractedSuperName(); final PsiDirectory targetDirectory = dialog.getTargetDirectory(); final MemberInfo[] selectedMemberInfos = dialog.getSelectedMemberInfos(); - final JavaDocPolicy javaDocPolicy = new JavaDocPolicy(dialog.getJavaDocPolicy()); + final DocCommentPolicy javaDocPolicy = new DocCommentPolicy(dialog.getJavaDocPolicy()); LocalHistoryAction a = LocalHistory.startAction(myProject, getCommandName(subclass, superclassName)); try { PsiClass superclass = null; diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java index 5bd6787781f9..23d5a66e8484 100644 --- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java @@ -19,7 +19,7 @@ import com.intellij.refactoring.memberPushDown.PushDownConflicts; import com.intellij.refactoring.memberPushDown.PushDownProcessor; import com.intellij.refactoring.util.FixableUsageInfo; import com.intellij.refactoring.util.FixableUsagesRefactoringProcessor; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.refactoring.util.classMembers.MemberInfoStorage; import com.intellij.usageView.UsageInfo; @@ -154,7 +154,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori protected void performRefactoring(final UsageInfo[] usages) { - new PushDownProcessor(mySuperClass.getProject(), myMemberInfos, mySuperClass, new JavaDocPolicy(JavaDocPolicy.ASIS)).run(); + new PushDownProcessor(mySuperClass.getProject(), myMemberInfos, mySuperClass, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); replaceInnerTypeUsages(); super.performRefactoring(usages); try { diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java index 018fa8b47a79..d5cdc429d54a 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java @@ -26,7 +26,7 @@ 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.JavaDocPolicy; +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; @@ -149,7 +149,7 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog try { try { PullUpHelper helper = new PullUpHelper(mySubclass, dialog.getSuperClass(), dialog.getSelectedMemberInfos(), - new JavaDocPolicy(dialog.getJavaDocPolicy())); + new DocCommentPolicy(dialog.getJavaDocPolicy())); helper.moveMembersToBase(); helper.moveFieldInitializations(); } diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java index 11101dd92d47..9aab99378f52 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java @@ -17,6 +17,7 @@ import com.intellij.refactoring.JavaRefactoringSettings; import com.intellij.refactoring.RefactoringBundle; 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.util.RefactoringHierarchyUtil; import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier; @@ -42,7 +43,7 @@ public class PullUpDialog extends DialogWrapper { private final List mySuperClasses; private final MemberInfoStorage myMemberInfoStorage; private List myMemberInfos; - private JavaDocPanel myJavaDocPanel; + private DocCommentPanel myJavaDocPanel; private JComboBox myClassCombo; @@ -172,7 +173,7 @@ public class PullUpDialog extends DialogWrapper { myMemberSelectionPanel.getTable().addMemberInfoChangeListener(myMemberInfoModel); panel.add(myMemberSelectionPanel, BorderLayout.CENTER); - myJavaDocPanel = new JavaDocPanel(RefactoringBundle.message("javadoc.for.abstracts")); + myJavaDocPanel = new DocCommentPanel(RefactoringBundle.message("javadoc.for.abstracts")); myJavaDocPanel.setPolicy(JavaRefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC); panel.add(myJavaDocPanel, BorderLayout.EAST); return panel; diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java index 146a67d0a905..b5d809ebcdfb 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java @@ -27,7 +27,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.listeners.JavaRefactoringListenerManager; import com.intellij.refactoring.listeners.impl.JavaRefactoringListenerManagerImpl; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.RefactoringHierarchyUtil; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.VisibilityUtil; @@ -45,13 +45,13 @@ public class PullUpHelper { private final PsiClass myTargetSuperClass; private final boolean myIsTargetInterface; private final MemberInfo[] myMembersToMove; - private final JavaDocPolicy myJavaDocPolicy; + private final DocCommentPolicy myJavaDocPolicy; private HashSet myMembersAfterMove = null; private final PsiManager myManager; public PullUpHelper(PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove, - JavaDocPolicy javaDocPolicy) { + DocCommentPolicy javaDocPolicy) { mySourceClass = sourceClass; myTargetSuperClass = targetSuperClass; myMembersToMove = membersToMove; diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java index a4c44a7446ed..10d689b693c5 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java @@ -10,10 +10,10 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.classMembers.MemberInfoChange; import com.intellij.refactoring.classMembers.MemberInfoModel; import com.intellij.refactoring.classMembers.UsedByDependencyMemberInfoModel; -import com.intellij.refactoring.memberPullUp.JavaDocPanel; +import com.intellij.refactoring.ui.DocCommentPanel; import com.intellij.refactoring.ui.MemberSelectionPanel; import com.intellij.refactoring.ui.RefactoringDialog; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import javax.swing.*; @@ -25,7 +25,7 @@ import java.util.List; public class PushDownDialog extends RefactoringDialog { private final List myMemberInfos; private final PsiClass myClass; - private JavaDocPanel myJavaDocPanel; + private DocCommentPanel myJavaDocPanel; private MemberInfoModel myMemberInfoModel; public PushDownDialog(Project project, MemberInfo[] memberInfos, PsiClass aClass) { @@ -91,7 +91,7 @@ public class PushDownDialog extends RefactoringDialog { memberSelectionPanel.getTable().addMemberInfoChangeListener(myMemberInfoModel); - myJavaDocPanel = new JavaDocPanel(RefactoringBundle.message("push.down.javadoc.panel.title")); + myJavaDocPanel = new DocCommentPanel(RefactoringBundle.message("push.down.javadoc.panel.title")); myJavaDocPanel.setPolicy(JavaRefactoringSettings.getInstance().PULL_UP_MEMBERS_JAVADOC); panel.add(myJavaDocPanel, BorderLayout.EAST); return panel; @@ -104,7 +104,7 @@ public class PushDownDialog extends RefactoringDialog { invokeRefactoring (new PushDownProcessor( getProject(), getSelectedMemberInfos(), myClass, - new JavaDocPolicy(getJavaDocPolicy()))); + new DocCommentPolicy(getJavaDocPolicy()))); } private class MyMemberInfoModel extends UsedByDependencyMemberInfoModel { diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java index 615785ac1487..163ebd4c40ae 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java @@ -17,7 +17,7 @@ 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.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.usageView.UsageInfo; @@ -32,12 +32,12 @@ public class PushDownProcessor extends BaseRefactoringProcessor { private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.memberPushDown.PushDownProcessor"); private final MemberInfo[] myMemberInfos; private PsiClass myClass; - private final JavaDocPolicy myJavaDocPolicy; + private final DocCommentPolicy myJavaDocPolicy; public PushDownProcessor(Project project, MemberInfo[] memberInfos, PsiClass aClass, - JavaDocPolicy javaDocPolicy) { + DocCommentPolicy javaDocPolicy) { super(project); myMemberInfos = memberInfos; myClass = aClass; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java index c7de553b165c..1d91d9530158 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java @@ -11,8 +11,8 @@ import com.intellij.psi.*; import com.intellij.psi.impl.source.PostprocessReformattingAspect; import com.intellij.psi.search.ProjectScope; import com.intellij.refactoring.extractSuperclass.ExtractSuperClassProcessor; -import com.intellij.refactoring.util.JavaDocPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.PsiTestUtil; import org.jetbrains.annotations.NonNls; @@ -58,7 +58,7 @@ public class ExtractSuperClassTest extends CodeInsightTestCase { newClassName, psiClass, members, false, - new JavaDocPolicy(JavaDocPolicy.ASIS)); + new DocCommentPolicy(DocCommentPolicy.ASIS)); processor.run(); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); FileDocumentManager.getInstance().saveAllDocuments(); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java index be02c8e4ed24..9edab2002147 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java @@ -11,8 +11,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.listeners.JavaRefactoringListenerManager; import com.intellij.refactoring.listeners.MoveMemberListener; import com.intellij.refactoring.memberPullUp.PullUpHelper; -import com.intellij.refactoring.util.JavaDocPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.JavaTestUtil; @@ -65,7 +65,7 @@ public class PullUpTest extends LightCodeInsightTestCase { } }; JavaRefactoringListenerManager.getInstance(getProject()).addMoveMembersListener(listener); - new PullUpHelper(sourceClass, targetClass, infos, new JavaDocPolicy(JavaDocPolicy.ASIS)).moveMembersToBase(); + new PullUpHelper(sourceClass, targetClass, infos, new DocCommentPolicy(DocCommentPolicy.ASIS)).moveMembersToBase(); JavaRefactoringListenerManager.getInstance(getProject()).removeMoveMembersListener(listener); assertEquals(countMoved[0], membersToFind.length); checkResultByFile(BASE_PATH + getTestName(false) + "_after.java"); diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java b/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java similarity index 84% rename from java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java rename to platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java index b8327a8a2bed..eec5a1ce88f7 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java @@ -6,9 +6,9 @@ * To change template for new class use * Code Style | Class Templates options (Tools | IDE Options). */ -package com.intellij.refactoring.memberPullUp; +package com.intellij.refactoring.ui; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.IdeBorderFactory; @@ -16,13 +16,13 @@ import javax.swing.*; import javax.swing.border.TitledBorder; import java.awt.*; -public class JavaDocPanel extends JPanel { +public class DocCommentPanel extends JPanel { private JRadioButton myRbJavaDocAsIs = null; private JRadioButton myRbJavaDocMove = null; private JRadioButton myRbJavaDocCopy = null; private final TitledBorder myBorder; - public JavaDocPanel(String title) { + public DocCommentPanel(String title) { setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); myBorder = IdeBorderFactory.createTitledBorder(title); this.setBorder(myBorder); @@ -59,10 +59,10 @@ public class JavaDocPanel extends JPanel { } public void setPolicy(final int javaDocPolicy) { - if (javaDocPolicy == JavaDocPolicy.COPY) { + if (javaDocPolicy == DocCommentPolicy.COPY) { myRbJavaDocCopy.setSelected(true); } - else if (javaDocPolicy == JavaDocPolicy.MOVE) { + else if (javaDocPolicy == DocCommentPolicy.MOVE) { myRbJavaDocMove.setSelected(true); } else { @@ -72,12 +72,12 @@ public class JavaDocPanel extends JPanel { public int getPolicy() { if (myRbJavaDocCopy != null && myRbJavaDocCopy.isSelected()) { - return JavaDocPolicy.COPY; + return DocCommentPolicy.COPY; } if (myRbJavaDocMove != null && myRbJavaDocMove.isSelected()) { - return JavaDocPolicy.MOVE; + return DocCommentPolicy.MOVE; } - return JavaDocPolicy.ASIS; + return DocCommentPolicy.ASIS; } } diff --git a/java/java-impl/src/com/intellij/refactoring/util/JavaDocPolicy.java b/platform/lang-impl/src/com/intellij/refactoring/util/DocCommentPolicy.java similarity index 69% rename from java/java-impl/src/com/intellij/refactoring/util/JavaDocPolicy.java rename to platform/lang-impl/src/com/intellij/refactoring/util/DocCommentPolicy.java index 5b2de7043072..7c2686ce50c5 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/JavaDocPolicy.java +++ b/platform/lang-impl/src/com/intellij/refactoring/util/DocCommentPolicy.java @@ -8,21 +8,21 @@ */ package com.intellij.refactoring.util; -import com.intellij.psi.javadoc.PsiDocComment; +import com.intellij.psi.PsiComment; import com.intellij.util.IncorrectOperationException; -public class JavaDocPolicy { +public class DocCommentPolicy { public static final int ASIS = 0; public static final int MOVE = 1; public static final int COPY = 2; private final int myJavaDocPolicy; - public JavaDocPolicy(int javaDocPolicy) { + public DocCommentPolicy(int javaDocPolicy) { myJavaDocPolicy = javaDocPolicy; } - public void processCopiedJavaDoc(PsiDocComment newDocComment, PsiDocComment docComment, boolean willOldBeDeletedAnyway) + public void processCopiedJavaDoc(T newDocComment, T docComment, boolean willOldBeDeletedAnyway) throws IncorrectOperationException{ if(myJavaDocPolicy == COPY || docComment == null) return; @@ -34,13 +34,13 @@ public class JavaDocPolicy { } } - public void processNewJavaDoc(PsiDocComment newDocComment) throws IncorrectOperationException { + public void processNewJavaDoc(T newDocComment) throws IncorrectOperationException { if(myJavaDocPolicy == ASIS && newDocComment != null) { newDocComment.delete(); } } - public void processOldJavaDoc(PsiDocComment oldDocComment) throws IncorrectOperationException { + public void processOldJavaDoc(T oldDocComment) throws IncorrectOperationException { if(myJavaDocPolicy == MOVE && oldDocComment != null) { oldDocComment.delete(); } diff --git a/refactoring/tests/com/intellij/refactoring/PushDownTest.java b/refactoring/tests/com/intellij/refactoring/PushDownTest.java index 7c9a5ab89193..70a78a4021bb 100644 --- a/refactoring/tests/com/intellij/refactoring/PushDownTest.java +++ b/refactoring/tests/com/intellij/refactoring/PushDownTest.java @@ -7,7 +7,7 @@ package com.intellij.refactoring; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.psi.*; import com.intellij.refactoring.memberPushDown.PushDownProcessor; -import com.intellij.refactoring.util.JavaDocPolicy; +import com.intellij.refactoring.util.DocCommentPolicy; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.testFramework.LightCodeInsightTestCase; @@ -45,7 +45,8 @@ public class PushDownTest extends LightCodeInsightTestCase { memberInfo.setChecked(true); membersToMove.add(memberInfo); - new PushDownProcessor(getProject(), membersToMove.toArray(new MemberInfo[membersToMove.size()]), classes[0], new JavaDocPolicy(JavaDocPolicy.ASIS)){ + new PushDownProcessor(getProject(), membersToMove.toArray(new MemberInfo[membersToMove.size()]), classes[0], new DocCommentPolicy( + DocCommentPolicy.ASIS)){ @Override protected boolean showConflicts(final List conflicts) { if (failure ? conflicts.isEmpty() : !conflicts.isEmpty()) { @@ -81,4 +82,4 @@ public class PushDownTest extends LightCodeInsightTestCase { public void testFieldAndStaticReferencedClass() throws Exception { doTest(); } -} \ No newline at end of file +}