From efdd70e279a972836c7eb7ee06bf4d59b52fedb2 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Wed, 16 Mar 2005 14:33:45 +0300 Subject: [PATCH] (no message) --- .../changeClassSignature/ChangeClassSignatureDialog.java | 2 +- .../refactoring/changeSignature/ChangeSignatureDialog.java | 2 +- .../encapsulateFields/EncapsulateFieldsDialog.java | 2 +- .../extractSuperclass/ExtractSuperBaseDialog.java | 2 +- .../InheritanceToDelegationDialog.java | 2 +- .../com/intellij/refactoring/inline/InlineFieldDialog.java | 2 +- .../com/intellij/refactoring/inline/InlineMethodDialog.java | 2 +- .../introduceParameter/IntroduceParameterDialog.java | 2 +- .../intellij/refactoring/memberPushDown/PushDownDialog.java | 6 +++--- .../moveClassesOrPackages/MoveClassesOrPackagesDialog.java | 1 + .../refactoring/move/moveInner/MoveInnerDialog.java | 2 +- .../moveInstanceMethod/MoveInstanceMethodDialogBase.java | 2 +- .../refactoring/move/moveMembers/MoveMembersDialog.java | 2 +- source/com/intellij/refactoring/rename/RenameDialog.java | 2 +- .../ReplaceConstructorWithFactoryDialog.java | 2 +- .../refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java | 2 +- .../com/intellij/refactoring/typeCook/TypeCookDialog.java | 2 +- .../intellij/refactoring/{ => ui}/RefactoringDialog.java | 3 ++- 18 files changed, 21 insertions(+), 19 deletions(-) rename source/com/intellij/refactoring/{ => ui}/RefactoringDialog.java (98%) diff --git a/source/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java b/source/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java index 051379b63903..d2e70164556c 100644 --- a/source/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java +++ b/source/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java @@ -5,7 +5,7 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.ui.*; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.ui.*; diff --git a/source/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java b/source/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java index 27edbd442cb0..606ebec814ba 100644 --- a/source/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java +++ b/source/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java @@ -19,7 +19,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.changeSignature.inCallers.CallerChooser; import com.intellij.refactoring.ui.*; import com.intellij.refactoring.util.CanonicalTypes; diff --git a/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java index cd8af7663693..b8101a2e5b62 100644 --- a/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java +++ b/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java @@ -12,7 +12,7 @@ import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.PsiSuperMethodUtil; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.ui.IdeBorderFactory; diff --git a/source/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java b/source/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java index a357b210a242..1eb6ed96c3d2 100644 --- a/source/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java +++ b/source/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java @@ -2,7 +2,7 @@ package com.intellij.refactoring.extractSuperclass; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import javax.swing.*; import java.awt.event.ItemEvent; diff --git a/source/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java b/source/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java index f13187726a70..071a3d9782fb 100644 --- a/source/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java +++ b/source/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java @@ -7,11 +7,11 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.ui.ClassCellRenderer; import com.intellij.refactoring.ui.MemberSelectionPanel; import com.intellij.refactoring.ui.NameSuggestionsField; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.classMembers.InterfaceMemberDependencyGraph; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.refactoring.util.classMembers.MemberInfoChange; diff --git a/source/com/intellij/refactoring/inline/InlineFieldDialog.java b/source/com/intellij/refactoring/inline/InlineFieldDialog.java index f84f2e5557df..5709a3ae37a8 100644 --- a/source/com/intellij/refactoring/inline/InlineFieldDialog.java +++ b/source/com/intellij/refactoring/inline/InlineFieldDialog.java @@ -6,8 +6,8 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiReferenceExpression; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.ui.IdeBorderFactory; import javax.swing.*; diff --git a/source/com/intellij/refactoring/inline/InlineMethodDialog.java b/source/com/intellij/refactoring/inline/InlineMethodDialog.java index 6164d7c71d8f..0190e445562d 100644 --- a/source/com/intellij/refactoring/inline/InlineMethodDialog.java +++ b/source/com/intellij/refactoring/inline/InlineMethodDialog.java @@ -7,8 +7,8 @@ import com.intellij.psi.PsiJavaCodeReferenceElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.ui.IdeBorderFactory; import javax.swing.*; diff --git a/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java b/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java index 76988e0d7ba1..0536ff52ef51 100644 --- a/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java +++ b/source/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java @@ -14,7 +14,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.IntroduceParameterRefactoring; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.ui.*; import com.intellij.ui.IdeBorderFactory; diff --git a/source/com/intellij/refactoring/memberPushDown/PushDownDialog.java b/source/com/intellij/refactoring/memberPushDown/PushDownDialog.java index b8ed1f06012d..c19f0d46d4bb 100644 --- a/source/com/intellij/refactoring/memberPushDown/PushDownDialog.java +++ b/source/com/intellij/refactoring/memberPushDown/PushDownDialog.java @@ -4,7 +4,7 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.memberPullUp.JavaDocPanel; import com.intellij.refactoring.ui.MemberSelectionPanel; @@ -40,14 +40,14 @@ public class PushDownDialog extends RefactoringDialog { } public MemberInfo[] getSelectedMemberInfos() { - ArrayList list = new ArrayList(myMemberInfos.length); + ArrayList list = new ArrayList(myMemberInfos.length); for (int idx = 0; idx < myMemberInfos.length; idx++) { MemberInfo info = myMemberInfos[idx]; if (info.isChecked() && myMemberInfoModel.isMemberEnabled(info)) { list.add(info); } } - return (MemberInfo[]) list.toArray(new MemberInfo[list.size()]); + return list.toArray(new MemberInfo[list.size()]); } protected void doHelpAction() { diff --git a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java index 109f5ec65c94..6b8d3f047111 100644 --- a/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java +++ b/source/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java @@ -13,6 +13,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.refactoring.*; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.move.MoveCallback; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.refactoring.util.RefactoringUtil; diff --git a/source/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java b/source/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java index 6da13590d9a9..04122bae78a5 100644 --- a/source/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java +++ b/source/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java @@ -12,7 +12,7 @@ import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.InheritanceUtil; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.ui.NameSuggestionsField; import com.intellij.refactoring.util.RefactoringMessageUtil; diff --git a/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java b/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java index 7a1d45cde70b..f4847eda5f46 100644 --- a/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java +++ b/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialogBase.java @@ -8,7 +8,7 @@ import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.PsiVariable; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.refactoring.RefactoringDialog; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.ui.VisibilityPanel; import com.intellij.refactoring.util.VisibilityUtil; import com.intellij.ui.ScrollPaneFactory; diff --git a/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java b/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java index 1a1e41c1ff49..9b0ca8c965a5 100644 --- a/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java +++ b/source/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java @@ -14,10 +14,10 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.move.MoveCallback; import com.intellij.refactoring.ui.MemberSelectionTable; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.ui.VisibilityPanel; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.refactoring.util.classMembers.MemberInfo; diff --git a/source/com/intellij/refactoring/rename/RenameDialog.java b/source/com/intellij/refactoring/rename/RenameDialog.java index af28a0df7476..14d5bf48ab0b 100644 --- a/source/com/intellij/refactoring/rename/RenameDialog.java +++ b/source/com/intellij/refactoring/rename/RenameDialog.java @@ -18,9 +18,9 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.impl.source.codeStyle.CodeStyleManagerEx; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.ui.NameSuggestionsField; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.ui.IdeBorderFactory; diff --git a/source/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java b/source/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java index f226b81626ee..3bd3fc85668b 100644 --- a/source/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java +++ b/source/com/intellij/refactoring/replaceConstructorWithFactory/ReplaceConstructorWithFactoryDialog.java @@ -7,8 +7,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.ui.NameSuggestionsField; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.ui.ReferenceEditorWithBrowseButton; diff --git a/source/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java b/source/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java index c6cc92aa0852..4bc64694f2bd 100644 --- a/source/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java +++ b/source/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java @@ -12,9 +12,9 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.ui.ClassCellRenderer; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.refactoring.util.RefactoringHierarchyUtil; import com.intellij.ui.IdeBorderFactory; diff --git a/source/com/intellij/refactoring/typeCook/TypeCookDialog.java b/source/com/intellij/refactoring/typeCook/TypeCookDialog.java index 8510c2e60152..d3a574b7269b 100644 --- a/source/com/intellij/refactoring/typeCook/TypeCookDialog.java +++ b/source/com/intellij/refactoring/typeCook/TypeCookDialog.java @@ -4,8 +4,8 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.refactoring.HelpID; -import com.intellij.refactoring.RefactoringDialog; import com.intellij.refactoring.RefactoringSettings; +import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.ui.IdeBorderFactory; import javax.swing.*; diff --git a/source/com/intellij/refactoring/RefactoringDialog.java b/source/com/intellij/refactoring/ui/RefactoringDialog.java similarity index 98% rename from source/com/intellij/refactoring/RefactoringDialog.java rename to source/com/intellij/refactoring/ui/RefactoringDialog.java index 5dc82ef02842..2add079e1971 100644 --- a/source/com/intellij/refactoring/RefactoringDialog.java +++ b/source/com/intellij/refactoring/ui/RefactoringDialog.java @@ -29,10 +29,11 @@ * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. * */ -package com.intellij.refactoring; +package com.intellij.refactoring.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.refactoring.BaseRefactoringProcessor; import javax.swing.*; import java.awt.event.ActionEvent;