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

vcs: rename implementations of AnActionExtensionProvider

Browse Source
This commit is contained in:
Aleksey Pivovarov
2017-06-02 18:17:46 +03:00
parent 72cfc729d0
commit b3790ddc22
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/META-INF/VcsExtensions.xml
+3 -3
View File
@@ -36,11 +36,11 @@
<diff.DiffTool implementation="com.intellij.openapi.vcs.changes.patch.tool.ApplyPatchDiffTool"/>
<diff.DiffTool implementation="com.intellij.openapi.vcs.changes.patch.tool.PatchDiffTool"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.openapi.vcs.update.ShowUpdatedDiffAction"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesActionProvider"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.openapi.vcs.update.ShowUpdatedDiffActionProvider"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction" order="last"/>
<openapi.vcs.history.actions.ShowDiffWithLocalAction.ExtensionProvider implementation="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesWithLocalAction"/>
<openapi.vcs.history.actions.ShowDiffWithLocalAction.ExtensionProvider implementation="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesWithLocalActionProvider"/>
<selectInTarget implementation="com.intellij.openapi.vcs.changes.SelectInChangesViewTarget"/>
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java → platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesActionProvider.java
+1 -1
View File
@@ -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";
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalAction.java → platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalActionProvider.java
+3 -3
View File
@@ -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);
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java
+4 -4
View File
@@ -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<ShelvedWrapper> 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);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java → platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffActionProvider.java
+1 -1
View File
@@ -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());
platform/vcs-log/impl/src/META-INF/vcs-log.xml
+4 -4
View File
@@ -36,10 +36,10 @@
<getDataRule key="Vcs.FileHistory.Ui" implementationClass="com.intellij.vcs.log.history.FileHistoryUiDataRule"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CompareRevisionsFromHistoryAction"/>
<openapi.vcs.history.actions.ShowDiffWithLocalAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.ShowDiffWithLocalFromHistoryAction"/>
<openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CreatePatchFromHistoryAction"/>
<openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.VcsLogCreatePatchAction"/>
<diff.actions.ShowDiffAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CompareRevisionsFromHistoryActionProvider"/>
<openapi.vcs.history.actions.ShowDiffWithLocalAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.ShowDiffWithLocalFromHistoryActionProvider"/>
<openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.history.CreatePatchFromHistoryActionProvider"/>
<openapi.vcs.changes.actions.CreatePatchFromChangesAction.ExtensionProvider implementation="com.intellij.vcs.log.ui.actions.VcsLogCreatePatchActionProvider"/>
</extensions>
<actions>
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchAction.java → platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/VcsLogCreatePatchActionProvider.java
+1 -1
View File
@@ -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;
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java → platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryActionProvider.java
+1 -1
View File
@@ -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";
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryAction.java → platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java
+1 -1
View File
@@ -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;
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryAction.java → platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/ShowDiffWithLocalFromHistoryActionProvider.java
+1 -1
View File
@@ -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;