IDEA-47182 (No-named action between "Set property..." and "Rollback")

This commit is contained in:
irengrig
2010-02-02 16:28:38 +03:00
parent a2242b8c42
commit 04678a38df
5 changed files with 25 additions and 5 deletions
@@ -56,6 +56,10 @@ import java.util.Comparator;
import java.util.List;
abstract class AbstractShowPropertiesDiffAction extends AnAction implements DumbAware {
protected AbstractShowPropertiesDiffAction(String name) {
super(name);
}
protected abstract DataKey<Change[]> getChangesKey();
@Nullable
protected abstract SVNRevision getBeforeRevisionValue(final Change change, final SvnVcs vcs) throws SVNException;
@@ -50,6 +50,10 @@ import java.util.List;
public class MarkTreeConflictResolvedAction extends AnAction implements DumbAware {
private final static String myText = SvnBundle.message("action.mark.tree.conflict.resolved.text");
public MarkTreeConflictResolvedAction() {
super(myText);
}
@Override
public void update(AnActionEvent e) {
final MyChecker checker = new MyChecker(e);
@@ -27,10 +27,14 @@ import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.wc.SVNRevision;
public class ShowPropertiesDiffAction extends AbstractShowPropertiesDiffAction {
public ShowPropertiesDiffAction() {
super(SvnBundle.message("action.Subversion.properties.diff.name"));
}
@Override
public void update(final AnActionEvent e) {
super.update(e);
e.getPresentation().setText(SvnBundle.message("action.Subversion.properties.diff.name"));
//e.getPresentation().setText(SvnBundle.message("action.Subversion.properties.diff.name"));
}
protected DataKey<Change[]> getChangesKey() {
@@ -17,9 +17,9 @@ package org.jetbrains.idea.svn.actions;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.util.IconLoader;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn.SvnBundle;
import org.jetbrains.idea.svn.SvnVcs;
@@ -32,6 +32,7 @@ public class ShowPropertiesDiffWithLocalAction extends AbstractShowPropertiesDif
private final Icon myIcon;
public ShowPropertiesDiffWithLocalAction() {
super(SvnBundle.message("action.Subversion.properties.diff.with.local.name"));
myIcon = IconLoader.getIcon("/icons/PropertiesDiffWithLocal.png");
}
@@ -39,7 +40,7 @@ public class ShowPropertiesDiffWithLocalAction extends AbstractShowPropertiesDif
public void update(final AnActionEvent e) {
super.update(e);
e.getPresentation().setText(SvnBundle.message("action.Subversion.properties.diff.with.local.name"));
//e.getPresentation().setText(SvnBundle.message("action.Subversion.properties.diff.with.local.name"));
e.getPresentation().setIcon(myIcon);
}
@@ -15,7 +15,10 @@
*/
package org.jetbrains.idea.svn.actions;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.actionSystem.Presentation;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.IconLoader;
@@ -23,6 +26,10 @@ import org.jetbrains.idea.svn.SvnBundle;
import org.jetbrains.idea.svn.dialogs.SvnMapDialog;
public class ShowSvnMapAction extends AnAction implements DumbAware {
public ShowSvnMapAction() {
super(SvnBundle.message("action.show.svn.map.text"));
}
@Override
public void update(final AnActionEvent e) {
final Project project = e.getData(PlatformDataKeys.PROJECT);
@@ -31,7 +38,7 @@ public class ShowSvnMapAction extends AnAction implements DumbAware {
presentation.setVisible(project != null);
presentation.setEnabled(project != null);
presentation.setText(SvnBundle.message("action.show.svn.map.text"));
//presentation.setText(SvnBundle.message("action.show.svn.map.text"));
presentation.setDescription(SvnBundle.message("action.show.svn.map.description"));
presentation.setIcon(IconLoader.getIcon("/icons/ShowWorkingCopies.png"));
}