MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

generify: JavaDocPolicy -> DocCommentPolicy

Browse Source
This commit is contained in:
Kirill Safonov
2009-09-11 15:56:11 +04:00
parent c8d31dbcbe
commit 42bc1846c4
20 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
+3 -3
View File
@@ -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;
}
}
}
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
+5 -5
View File
@@ -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;
}
}
}
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
+2 -2
View File
@@ -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);
}
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
+3 -3
View File
@@ -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<MemberInfo> 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();
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
+3 -3
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
+2 -2
View File
@@ -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);
}
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
+2 -2
View File
@@ -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();
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
+2 -2
View File
@@ -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
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
+3 -3
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
+2 -2
View File
@@ -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 {
java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
+2 -2
View File
@@ -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();
}
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+3 -2
View File
@@ -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<PsiClass> mySuperClasses;
private final MemberInfoStorage myMemberInfoStorage;
private List<MemberInfo> 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;
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java
+3 -3
View File
@@ -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<PsiMember> myMembersAfterMove = null;
private final PsiManager myManager;
public PullUpHelper(PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove,
JavaDocPolicy javaDocPolicy) {
DocCommentPolicy javaDocPolicy) {
mySourceClass = sourceClass;
myTargetSuperClass = targetSuperClass;
myMembersToMove = membersToMove;
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java
+5 -5
View File
@@ -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<MemberInfo> myMemberInfos;
private final PsiClass myClass;
private JavaDocPanel myJavaDocPanel;
private DocCommentPanel myJavaDocPanel;
private MemberInfoModel<PsiMember, MemberInfo> 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<PsiMember, PsiClass, MemberInfo> {
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+3 -3
View File
@@ -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;
java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java
+2 -2
View File
@@ -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();
java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java
+2 -2
View File
@@ -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");
java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java → platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java
+9 -9
View File
@@ -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;
}
}
java/java-impl/src/com/intellij/refactoring/util/JavaDocPolicy.java → platform/lang-impl/src/com/intellij/refactoring/util/DocCommentPolicy.java
+6 -6
View File
@@ -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<T extends PsiComment> {
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();
}
refactoring/tests/com/intellij/refactoring/PushDownTest.java
+4 -3
View File
@@ -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<String> conflicts) {
if (failure ? conflicts.isEmpty() : !conflicts.isEmpty()) {
@@ -81,4 +82,4 @@ public class PushDownTest extends LightCodeInsightTestCase {
public void testFieldAndStaticReferencedClass() throws Exception {
doTest();
}
}
}