From e1a591b89e5107033caa0cd76a2d112cab6bbcd1 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Tue, 22 Feb 2005 20:19:47 +0300 Subject: [PATCH] Removed obsolete markerId --- .../ChangeMethodSignatureFromUsageFix.java | 2 +- .../daemon/impl/quickfix/MethodParameterFix.java | 2 +- .../daemon/impl/quickfix/MethodReturnFix.java | 2 +- .../daemon/impl/quickfix/MoveToPackageFix.java | 2 +- .../impl/quickfix/RemoveUnusedParameterFix.java | 2 +- .../impl/quickfix/RenamePublicClassFix.java | 2 +- .../impl/quickfix/SuperMethodReturnFix.java | 2 +- .../UnusedParametersInspection.java | 2 +- .../unusedReturnValue/UnusedReturnValue.java | 2 +- source/com/intellij/ide/util/DeleteHandler.java | 2 +- .../refactoring/BaseRefactoringProcessor.java | 15 ++++----------- .../intellij/refactoring/RefactoringDialog.java | 2 +- .../com/intellij/refactoring/RefactoringImpl.java | 2 +- .../EncapsulateFieldsProcessor.java | 4 ++-- .../extractInterface/ExtractClassUtil.java | 2 +- .../IntroduceParameterHandler.java | 2 +- .../refactoring/migration/MigrationManager.java | 2 +- .../MoveFilesOrDirectoriesUtil.java | 2 +- .../move/moveInner/MoveInnerProcessor.java | 2 +- .../move/moveMembers/MoveMembersProcessor.java | 4 ++-- .../refactoring/rename/RenameProcessor.java | 4 ++-- .../refactoring/safeDelete/SafeDeleteHandler.java | 2 +- .../properties/BindingProperty.java | 2 +- 23 files changed, 29 insertions(+), 36 deletions(-) diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java index c42782697d11..82214e915ff2 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java @@ -129,7 +129,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction { processor.testRun(); } else { - processor.run(null); + processor.run(); } ApplicationManager.getApplication().runWriteAction(new Runnable() { diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java index 76278a1cdb88..0cfeff955fc4 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java @@ -80,7 +80,7 @@ public class MethodParameterFix implements IntentionAction { processor.testRun(); } else { - processor.run(null); + processor.run(); } diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java index bf4af48a3f4e..7aaabd92b45e 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java @@ -65,7 +65,7 @@ public class MethodReturnFix implements IntentionAction { processor.testRun(); } else { - processor.run(null); + processor.run(); } if (method.getContainingFile() != file) { QuickFixAction.spoilDocument(project, file); diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/MoveToPackageFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/MoveToPackageFix.java index c2324995bd77..07190d4d0455 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/MoveToPackageFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/MoveToPackageFix.java @@ -69,7 +69,7 @@ public class MoveToPackageFix implements IntentionAction { new PsiElement[]{((PsiJavaFile) myFile).getClasses()[0]}, new SingleSourceRootMoveDestination(PackageWrapper.create(directory.getPackage()), directory), false, false, - null).run(null); + null).run(); } catch (IncorrectOperationException e) { LOG.error(e); diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java index 685618fb0911..c57f02275f21 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java @@ -59,7 +59,7 @@ public class RemoveUnusedParameterFix implements IntentionAction { processor.testRun(); } else { - processor.run(null); + processor.run(); } } diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/RenamePublicClassFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/RenamePublicClassFix.java index 3010f6061bfe..c1020973e206 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/RenamePublicClassFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/RenamePublicClassFix.java @@ -46,7 +46,7 @@ public class RenamePublicClassFix implements IntentionAction { VirtualFile vFile = file.getVirtualFile(); String newName = vFile.getNameWithoutExtension(); RenameProcessor processor = new RenameProcessor(project, myClass, newName, false, false); - processor.run((Object)null); + processor.run(); } public boolean startInWriteAction() { diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java index 34e891d53f1b..522f4c2bb3a7 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java @@ -66,7 +66,7 @@ public class SuperMethodReturnFix implements IntentionAction { if (ApplicationManager.getApplication().isUnitTestMode()) { processor.testRun(); } else { - processor.run(null); + processor.run(); } } diff --git a/source/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/source/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java index a314136abc48..d669c58d24f7 100644 --- a/source/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java +++ b/source/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java @@ -199,6 +199,6 @@ public class UnusedParametersInspection extends FilteringInspectionTool { psiMethod.getReturnType(), parameterInfos); - csp.run(null); + csp.run(); } } diff --git a/source/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java b/source/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java index ce35153800f5..5b3fa0b306a9 100644 --- a/source/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java +++ b/source/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java @@ -133,7 +133,7 @@ public class UnusedReturnValue extends DescriptorProviderInspection { PsiType.VOID, infos); - csp.run(null); + csp.run(); } } } diff --git a/source/com/intellij/ide/util/DeleteHandler.java b/source/com/intellij/ide/util/DeleteHandler.java index 2acb0414413d..aab20ca47e29 100644 --- a/source/com/intellij/ide/util/DeleteHandler.java +++ b/source/com/intellij/ide/util/DeleteHandler.java @@ -89,7 +89,7 @@ public class DeleteHandler { public void run() { dialog.close(DeleteDialog.CANCEL_EXIT_CODE); } - }, elements, dialog.isSearchInComments(), dialog.isSearchInNonJava(), true).run(null); + }, elements, dialog.isSearchInComments(), dialog.isSearchInNonJava(), true).run(); } } ); diff --git a/source/com/intellij/refactoring/BaseRefactoringProcessor.java b/source/com/intellij/refactoring/BaseRefactoringProcessor.java index ff40820d5f30..5aea0a5ee61f 100644 --- a/source/com/intellij/refactoring/BaseRefactoringProcessor.java +++ b/source/com/intellij/refactoring/BaseRefactoringProcessor.java @@ -5,15 +5,15 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.localVcs.impl.LvcsIntegration; import com.intellij.openapi.localVcs.LvcsAction; +import com.intellij.openapi.localVcs.impl.LvcsIntegration; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.EmptyRunnable; import com.intellij.openapi.util.Factory; import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.wm.WindowManager; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -21,7 +21,6 @@ import com.intellij.refactoring.listeners.RefactoringListenerManager; import com.intellij.refactoring.listeners.impl.RefactoringListenerManagerImpl; import com.intellij.refactoring.listeners.impl.RefactoringTransaction; import com.intellij.refactoring.ui.ConflictsDialog; -import com.intellij.refactoring.util.RefactoringChangeMarker; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.usageView.FindUsagesCommand; import com.intellij.usageView.UsageInfo; @@ -40,7 +39,6 @@ public abstract class BaseRefactoringProcessor { public static final Runnable EMPTY_CALLBACK = EmptyRunnable.getInstance(); protected final Project myProject; - private Object myMarkerId; private RefactoringTransaction myTransaction; private boolean myIsPreviewUsages; protected Runnable myPrepareSuccessfulSwingThreadCallback = EMPTY_CALLBACK; @@ -120,8 +118,7 @@ public abstract class BaseRefactoringProcessor { protected abstract String getCommandName(); - public void run(Object markerId) { - myMarkerId = markerId; + public void run() { final UsageInfo[][] usages = new UsageInfo[1][]; @@ -297,11 +294,7 @@ public abstract class BaseRefactoringProcessor { try { final UsageInfo[] _usages = usages; - ApplicationManager.getApplication().runWriteAction(new RefactoringChangeMarker() { - public Object getId() { - return myMarkerId; - } - + ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { PsiDocumentManager.getInstance(myProject).commitAllDocuments(); RefactoringListenerManagerImpl listenerManager = diff --git a/source/com/intellij/refactoring/RefactoringDialog.java b/source/com/intellij/refactoring/RefactoringDialog.java index 6bc04e74c7ee..d35f4734d34c 100644 --- a/source/com/intellij/refactoring/RefactoringDialog.java +++ b/source/com/intellij/refactoring/RefactoringDialog.java @@ -166,6 +166,6 @@ public abstract class RefactoringDialog extends DialogWrapper { }; processor.setPrepareSuccessfulSwingThreadCallback(prepareSuccessfulCallback); processor.setPreviewUsages(isPreviewUsages()); - processor.run(null); + processor.run(); } } diff --git a/source/com/intellij/refactoring/RefactoringImpl.java b/source/com/intellij/refactoring/RefactoringImpl.java index cae59ca11ee9..875cd9d73847 100644 --- a/source/com/intellij/refactoring/RefactoringImpl.java +++ b/source/com/intellij/refactoring/RefactoringImpl.java @@ -53,7 +53,7 @@ public abstract class RefactoringImpl implem } public void run() { - myProcessor.run(null); + myProcessor.run(); } diff --git a/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java index 75f68c97d669..09a20088bca2 100644 --- a/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java +++ b/source/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java @@ -58,7 +58,7 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { return "Encapsulating fields in " + UsageViewUtil.getDescriptiveName(myClass); } - public void run(Object markerId) { + public void run() { myFields = myDialog.getSelectedFields(); if (myFields.length == 0){ String message = "No fields selected"; @@ -67,7 +67,7 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor { } myClass = myFields[0].getContainingClass(); - super.run(markerId); + super.run(); } protected boolean preprocessUsages(UsageInfo[][] usages) { diff --git a/source/com/intellij/refactoring/extractInterface/ExtractClassUtil.java b/source/com/intellij/refactoring/extractInterface/ExtractClassUtil.java index 3aec8ddea404..e74b41718bf9 100644 --- a/source/com/intellij/refactoring/extractInterface/ExtractClassUtil.java +++ b/source/com/intellij/refactoring/extractInterface/ExtractClassUtil.java @@ -41,7 +41,7 @@ public class ExtractClassUtil { RefactoringSettings.getInstance().EXTRACT_INTERFACE_PREVIEW_USAGES = dialog.isPreviewUsages(); TurnRefsToSuperProcessor processor = new TurnRefsToSuperProcessor(project, (PsiClass) classElement, (PsiClass) interfaceElement, true); - processor.run(null); + processor.run(); } } } diff --git a/source/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/source/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java index 83abe3b5d316..892b4830b205 100644 --- a/source/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java +++ b/source/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java @@ -213,7 +213,7 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase implements R myParameterInitializer, myExpressionToSearchFor, myLocalVar, isDeleteLocalVariable, parameterName, replaceAllOccurences, - IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, null).run(null); + IntroduceParameterRefactoring.REPLACE_FIELDS_WITH_GETTERS_NONE, false, null).run(); } return true; } diff --git a/source/com/intellij/refactoring/migration/MigrationManager.java b/source/com/intellij/refactoring/migration/MigrationManager.java index c248f37fb5d4..e9c61ab1e50b 100644 --- a/source/com/intellij/refactoring/migration/MigrationManager.java +++ b/source/com/intellij/refactoring/migration/MigrationManager.java @@ -19,6 +19,6 @@ public class MigrationManager { MigrationMap migrationMap = migrationDialog.getMigrationMap(); if (migrationMap == null) return; - new MigrationProcessor(myProject, migrationMap).run(null); + new MigrationProcessor(myProject, migrationMap).run(); } } \ No newline at end of file diff --git a/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java b/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java index ed1ecfc842e4..c00f1d0d9d06 100644 --- a/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java +++ b/source/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java @@ -86,7 +86,7 @@ public class MoveFilesOrDirectoriesUtil { public void run() { moveDialog.close(DialogWrapper.CANCEL_EXIT_CODE); } - }).run(null); + }).run(); } catch (IncorrectOperationException e) { String helpId = HelpID.getMoveHelpID(elements[0]); diff --git a/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java b/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java index 2763687d48eb..d7d6f2e87eb1 100644 --- a/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java +++ b/source/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java @@ -368,7 +368,7 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor { setup(innerClass, className, passOuterClass, parameterName, previewUsages, dialog.isSearchInComments(), dialog.isSearchInNonJavaFiles()); - run((Object)null); + run(); } public void setup(final PsiClass innerClass, diff --git a/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java b/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java index 8da831c48ace..4647903663ca 100644 --- a/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java +++ b/source/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java @@ -264,14 +264,14 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor { return showConflicts(conflicts, usages); } - public void run(Object markerId) { + public void run() { if (myMembersToMove.size() == 0){ String message = "No members selected"; RefactoringMessageUtil.showErrorMessage(MoveMembersImpl.REFACTORING_NAME, message, HelpID.MOVE_MEMBERS, myProject); return; } if (canRefactor()) { - super.run(markerId); + super.run(); } } diff --git a/source/com/intellij/refactoring/rename/RenameProcessor.java b/source/com/intellij/refactoring/rename/RenameProcessor.java index 774f6e44b118..9c8e7be142d8 100644 --- a/source/com/intellij/refactoring/rename/RenameProcessor.java +++ b/source/com/intellij/refactoring/rename/RenameProcessor.java @@ -96,7 +96,7 @@ public class RenameProcessor extends BaseRefactoringProcessor { return myElement instanceof PsiVariable; } - public void run(Object markerId) { + public void run() { String message = null; prepareRenaming(); try { @@ -114,7 +114,7 @@ public class RenameProcessor extends BaseRefactoringProcessor { return; } - super.run(markerId); + super.run(); } public void prepareRenaming() { diff --git a/source/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java b/source/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java index caf659033ff9..4c081cfadb0a 100644 --- a/source/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java +++ b/source/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java @@ -77,7 +77,7 @@ public class SafeDeleteHandler implements RefactoringActionHandler { public void run() { dialog.close(SafeDeleteDialog.CANCEL_EXIT_CODE); } - }, elementsToDelete, dialog.isSearchInComments(), dialog.isSearchInNonJava(), true).run(null); + }, elementsToDelete, dialog.isSearchInComments(), dialog.isSearchInNonJava(), true).run(); } }); diff --git a/source/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java b/source/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java index 4054fb7f7ac7..8c9b08a9bf9a 100644 --- a/source/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java +++ b/source/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java @@ -118,6 +118,6 @@ public final class BindingProperty extends Property { PsiDocumentManager.getInstance(myGuiEditor.getProject()).commitAllDocuments(); final RenameProcessor processor = new RenameProcessor(project, oldField, newBinding, true, true); - processor.run((Object)null); + processor.run(); } }