diff --git a/platform/platform-resources/src/META-INF/VcsExtensions.xml b/platform/platform-resources/src/META-INF/VcsExtensions.xml index 257ebef5d175..7b5a8f01920c 100644 --- a/platform/platform-resources/src/META-INF/VcsExtensions.xml +++ b/platform/platform-resources/src/META-INF/VcsExtensions.xml @@ -36,11 +36,11 @@ - - + + - + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesActionProvider.java similarity index 99% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java rename to platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesActionProvider.java index 6d44ed22c9b3..39622e41e269 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesActionProvider.java @@ -73,7 +73,7 @@ import static com.intellij.openapi.vcs.changes.patch.PatchDiffRequestFactory.cre import static com.intellij.util.ObjectUtils.assertNotNull; import static com.intellij.util.ObjectUtils.chooseNotNull; -public class DiffShelvedChangesAction implements AnActionExtensionProvider { +public class DiffShelvedChangesActionProvider implements AnActionExtensionProvider { private static final String DIFF_WITH_BASE_ERROR = "Base content not found or not applicable."; public static final String SHELVED_VERSION = "Shelved Version"; public static final String BASE_VERSION = "Base Version"; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalActionProvider.java similarity index 82% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalAction.java rename to platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalActionProvider.java index e530e417733b..377f95c440f7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalActionProvider.java @@ -19,7 +19,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.AnActionExtensionProvider; import org.jetbrains.annotations.NotNull; -public class DiffShelvedChangesWithLocalAction implements AnActionExtensionProvider { +public class DiffShelvedChangesWithLocalActionProvider implements AnActionExtensionProvider { @Override public boolean isActive(@NotNull AnActionEvent e) { return e.getData(ShelvedChangesViewManager.SHELVED_CHANGELIST_KEY) != null || @@ -29,11 +29,11 @@ public class DiffShelvedChangesWithLocalAction implements AnActionExtensionProvi @Override public void update(@NotNull AnActionEvent e) { e.getPresentation().setDescription("Compare shelved version with current"); - e.getPresentation().setEnabled(DiffShelvedChangesAction.isEnabled(e.getDataContext())); + e.getPresentation().setEnabled(DiffShelvedChangesActionProvider.isEnabled(e.getDataContext())); } @Override public void actionPerformed(@NotNull AnActionEvent e) { - DiffShelvedChangesAction.showShelvedChangesDiff(e.getDataContext(), true); + DiffShelvedChangesActionProvider.showShelvedChangesDiff(e.getDataContext(), true); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java index 8e0d58c0accc..e3b076722bc8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java @@ -99,7 +99,7 @@ import java.util.List; import static com.intellij.icons.AllIcons.Vcs.Patch_applied; import static com.intellij.openapi.actionSystem.Anchor.AFTER; -import static com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction.createAppliedTextPatch; +import static com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesActionProvider.createAppliedTextPatch; import static com.intellij.util.FontUtil.spaceAndThinSpace; import static com.intellij.util.ObjectUtils.assertNotNull; import static com.intellij.util.containers.ContainerUtil.notNullize; @@ -165,7 +165,7 @@ public class ShelvedChangesViewManager implements ProjectComponent { protected boolean onDoubleClick(MouseEvent e) { DataContext dc = DataManager.getInstance().getDataContext(myTree); if (getShelveChanges(dc).isEmpty() && getBinaryShelveChanges(dc).isEmpty()) return false; - DiffShelvedChangesAction.showShelvedChangesDiff(dc); + DiffShelvedChangesActionProvider.showShelvedChangesDiff(dc); return true; } }.installOn(myTree); @@ -744,12 +744,12 @@ public class ShelvedChangesViewManager implements ProjectComponent { private class MyShelvedPreviewProcessor extends CacheDiffRequestProcessor implements DiffPreviewUpdateProcessor { - @NotNull private final DiffShelvedChangesAction.PatchesPreloader myPreloader; + @NotNull private final DiffShelvedChangesActionProvider.PatchesPreloader myPreloader; @Nullable private ShelvedWrapper myCurrentShelvedElement; public MyShelvedPreviewProcessor(@NotNull Project project) { super(project); - myPreloader = new DiffShelvedChangesAction.PatchesPreloader(project); + myPreloader = new DiffShelvedChangesActionProvider.PatchesPreloader(project); Disposer.register(project, this); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffActionProvider.java similarity index 98% rename from platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java rename to platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffActionProvider.java index 588611b74eac..7b5a0738a97f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffActionProvider.java @@ -47,7 +47,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -public class ShowUpdatedDiffAction implements AnActionExtensionProvider { +public class ShowUpdatedDiffActionProvider implements AnActionExtensionProvider { @Override public boolean isActive(@NotNull AnActionEvent e) { return isVisible(e.getDataContext()); diff --git a/platform/vcs-log/impl/src/META-INF/vcs-log.xml b/platform/vcs-log/impl/src/META-INF/vcs-log.xml index f40a682e1e3a..f602b7db111d 100644 --- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml +++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml @@ -36,10 +36,10 @@ - - - - + + + + diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java similarity index 95% rename from platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchAction.java rename to platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java index af4b301d8fc7..18a1b058286e 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Arrays; -public class VcsLogCreatePatchAction implements AnActionExtensionProvider { +public class VcsLogCreatePatchActionProvider implements AnActionExtensionProvider { @Override public boolean isActive(@NotNull AnActionEvent e) { return e.getData(VcsLogDataKeys.VCS_LOG_UI) != null; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryActionProvider.java similarity index 98% rename from platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java rename to platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryActionProvider.java index b2c6d7c7c7b5..ea2dfc46f6e2 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryActionProvider.java @@ -40,7 +40,7 @@ import java.util.List; import static com.intellij.util.ObjectUtils.notNull; -public class CompareRevisionsFromHistoryAction implements AnActionExtensionProvider { +public class CompareRevisionsFromHistoryActionProvider implements AnActionExtensionProvider { private static final String COMPARE_TEXT = "Compare"; private static final String COMPARE_DESCRIPTION = "Compare selected versions"; private static final String DIFF_TEXT = "Show Diff"; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java similarity index 96% rename from platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryAction.java rename to platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java index fb460ad7fe9e..9cf8713b8920 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public class CreatePatchFromHistoryAction implements AnActionExtensionProvider { +public class CreatePatchFromHistoryActionProvider implements AnActionExtensionProvider { @Override public boolean isActive(@NotNull AnActionEvent e) { return e.getData(VcsLogInternalDataKeys.FILE_HISTORY_UI) != null; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryActionProvider.java similarity index 95% rename from platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryAction.java rename to platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryActionProvider.java index edd14176b570..6b0501b5b256 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryActionProvider.java @@ -28,7 +28,7 @@ import com.intellij.vcs.log.ui.VcsLogInternalDataKeys; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class ShowDiffWithLocalFromHistoryAction extends FileHistorySingleCommitAction implements AnActionExtensionProvider { +public class ShowDiffWithLocalFromHistoryActionProvider extends FileHistorySingleCommitAction implements AnActionExtensionProvider { @Override public boolean isActive(@NotNull AnActionEvent e) { return e.getData(VcsLogInternalDataKeys.FILE_HISTORY_UI) != null;