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

svn: Removed unnecessary "Merge from..." action ("MergeFromAction" class) - "Show Working Copies" action could be used instead (to navigate to "Subversion Working Copies Information" panel)

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2015-11-26 17:48:29 +03:00
parent f0d97f1608
commit d759d9067e
2 changed files with 1 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/META-INF/plugin.xml
+1 -4
View File
@@ -105,11 +105,8 @@
<add-to-group group-id="SubversionGroup" relative-to-action="ChangesView.AddUnversioned" anchor="after"/>
</group>
<action class="org.jetbrains.idea.svn.dialogs.MergeFromAction" id="Subversion.MergeFrom">
<add-to-group relative-to-action="Vcs.IntegrateProject" anchor="after" group-id="VcsGlobalGroup"/>
</action>
<action class="org.jetbrains.idea.svn.actions.CleanupProjectAction" id="Subversion.CleanupProject">
<add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Subversion.MergeFrom"/>
<add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Vcs.IntegrateProject"/>
</action>
<action id="Svn.Show.Working.Copies" class="org.jetbrains.idea.svn.actions.ShowSvnMapAction" text="Show Working Copies"
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java
-59
View File
@@ -1,59 +0,0 @@
/*
* Copyright 2000-2010 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.idea.svn.dialogs;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.idea.svn.SvnVcs;
import org.jetbrains.idea.svn.WorkingCopiesContent;
public class MergeFromAction extends DumbAwareAction {
public MergeFromAction() {
super("Merge from...", "One-click merge for feature branches", null);
}
@Override
public void actionPerformed(AnActionEvent e) {
if (! isEnabled(e)) return;
final DataContext dc = e.getDataContext();
final Project project = CommonDataKeys.PROJECT.getData(dc);
if (project == null) return;
WorkingCopiesContent.show(project);
}
@Override
public void update(AnActionEvent e) {
final DataContext dc = e.getDataContext();
final Project project = CommonDataKeys.PROJECT.getData(dc);
if (project == null || project.isDefault()) return;
e.getPresentation().setVisible(isEnabled(e));
}
private boolean isEnabled(AnActionEvent e) {
final DataContext dc = e.getDataContext();
final Project project = CommonDataKeys.PROJECT.getData(dc);
if (project == null || project.isDefault()) return false;
final VirtualFile[] files = ProjectLevelVcsManager.getInstance(project).getRootsUnderVcs(SvnVcs.getInstance(project));
return files != null && files.length > 0;
}
}