Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.properties6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java2
7 files changed, 29 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties
index 842ec4258..85b1eac2c 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.properties
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties
@@ -130,6 +130,9 @@ UpdateAction.label=&Update
UpdateAction.name=Update
UpdateAction.tooltip=Update resources with new content from the repository
+UpdateAllAction.name=Update All Incoming Changes
+UpdateAllAction.tooltip=Update all incoming changes with new content from the repository
+
UpdateActionSwitch.label=S&witch to Another Branch or Version...
UpdateActionSwitch.name=Switch to Another Branch or Version
UpdateActionSwitch.tooltip=Switch to Another Branch or Version
@@ -148,6 +151,9 @@ CommitAction.label=&Commit...
CommitAction.name=Commit
CommitAction.tooltip=Commit resources to the repository
+CommitAllAction.name=Commit All Outgoing Changes
+CommitAllAction.tooltip=Commit all outgoing changes to the repository
+
CheckoutAction.label=&Check Out
CheckoutAction.tooltip=Check out a module from the repository to the workspace
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml
index 7aeb8e697..38190c76c 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml
@@ -1236,6 +1236,11 @@
name="%CommitAction.name"
id="org.eclipse.team.cvs.ui.commit"/>
<command
+ description="%CommitAllAction.tooltip"
+ categoryId="org.eclipse.team.cvs.ui.actionSet"
+ name="%CommitAllAction.name"
+ id="org.eclipse.team.cvs.ui.commitAll"/>
+ <command
categoryId="org.eclipse.team.cvs.ui.actionSet"
description="%ReplaceWithAction.tooltip"
name="%ReplaceWithAction.name"
@@ -1271,6 +1276,11 @@
name="%UpdateAction.name"
id="org.eclipse.team.cvs.ui.update"/>
<command
+ description="%UpdateAllAction.tooltip"
+ categoryId="org.eclipse.team.cvs.ui.actionSet"
+ id="org.eclipse.team.cvs.ui.updateAll"
+ name="%UpdateAllAction.name">
+ <command
description="%GenerateDiff.tooltip"
categoryId="org.eclipse.team.cvs.ui.actionSet"
name="%GenerateDiff.name"
@@ -1324,7 +1334,8 @@
categoryId="org.eclipse.team.cvs.ui.actionSet"
description="%Synchronize.tooltip"
name="%Synchronize.name"
- id="org.eclipse.team.cvs.ui.sync"/>
+ id="org.eclipse.team.cvs.ui.sync"/>
+ </command>
</extension>
<!-- Commented out awaiting menu support from UI
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index 1f9085542..0221e9650 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -229,8 +229,10 @@ public interface ICVSUIConstants {
// Command Ids
public final String CMD_COMMIT = "org.eclipse.team.cvs.ui.commit"; //$NON-NLS-1$
+ public final String CMD_COMMIT_ALL = "org.eclipse.team.cvs.ui.commitAll"; //$NON-NLS-1$
public final String CMD_SYNCHRONIZE = "org.eclipse.team.ui.synchronizeLast"; //$NON-NLS-1$
public final String CMD_UPDATE = "org.eclipse.team.cvs.ui.update"; //$NON-NLS-1$
+ public final String CMD_UPDATE_ALL = "org.eclipse.team.cvs.ui.updateAll"; //$NON-NLS-1$
public final String CMD_CREATEPATCH = "org.eclipse.team.cvs.ui.GenerateDiff"; //$NON-NLS-1$
public final String CMD_TAGASVERSION = "org.eclipse.team.cvs.ui.tag"; //$NON-NLS-1$
public final String CMD_BRANCH = "org.eclipse.team.cvs.ui.branch"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java
index 70e6378d5..ee228a58f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java
@@ -18,6 +18,7 @@ import org.eclipse.team.core.ICache;
import org.eclipse.team.core.ICacheListener;
import org.eclipse.team.core.diff.*;
import org.eclipse.team.core.mapping.ISynchronizationContext;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.ui.mapping.ITeamContentProviderManager;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
@@ -32,6 +33,8 @@ public class WorkspaceCommitAction extends AbstractCommitAction implements IDiff
*/
public WorkspaceCommitAction(ISynchronizePageConfiguration configuration) {
super(configuration);
+ setId(ICVSUIConstants.CMD_COMMIT_ALL);
+ setActionDefinitionId(ICVSUIConstants.CMD_COMMIT_ALL);
final IDiffTree tree = getDiffTree();
tree.addDiffChangeListener(this);
getSynchronizationContext().getCache().addCacheListener(new ICacheListener() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java
index b9b375e60..52f3a0bb8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java
@@ -158,6 +158,8 @@ public class WorkspaceModelParticipant extends
Utils.initAction(action, "ConfirmMergedAction.", Policy.getActionBundle()); //$NON-NLS-1$
} else if (mergeActionId == MERGE_ALL_ACTION_ID) {
Utils.initAction(action, "WorkspaceToolbarUpdateAction.", Policy.getActionBundle()); //$NON-NLS-1$
+ action.setId(ICVSUIConstants.CMD_UPDATE_ALL);
+ action.setActionDefinitionId(ICVSUIConstants.CMD_UPDATE_ALL);
} else {
super.configureMergeAction(mergeActionId, action);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
index a2e779cac..d0c6c154c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
@@ -34,6 +34,8 @@ public class WorkspaceCommitAction extends CVSParticipantAction {
public WorkspaceCommitAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) {
super(configuration, provider, bundleKey);
+ setId(ICVSUIConstants.CMD_COMMIT_ALL);
+ setActionDefinitionId(ICVSUIConstants.CMD_COMMIT_ALL);
}
/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
index 2a687f116..b08ea2153 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
@@ -31,6 +31,8 @@ public class WorkspaceUpdateAction extends CVSParticipantAction {
public WorkspaceUpdateAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) {
super(configuration, provider, bundleKey);
+ setId(ICVSUIConstants.CMD_UPDATE_ALL);
+ setActionDefinitionId(ICVSUIConstants.CMD_UPDATE_ALL);
}
/* (non-Javadoc)

Back to the top