Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2010-06-28 08:42:01 +0000
committerTomasz Zarna2010-06-28 08:42:01 +0000
commitaf9f75686a755000ef06addafc93a4406a7a0ce3 (patch)
tree0096a8b66518d7432cb0ed7d8a525af16acc1233 /bundles/org.eclipse.team.ui/src/org/eclipse
parent82cef3b13c3a012b8ac9155e7b757b87b159ce72 (diff)
downloadeclipse.platform.team-af9f75686a755000ef06addafc93a4406a7a0ce3.tar.gz
eclipse.platform.team-af9f75686a755000ef06addafc93a4406a7a0ce3.tar.xz
eclipse.platform.team-af9f75686a755000ef06addafc93a4406a7a0ce3.zip
bug 317967: [Sync View] Escape & in change set names when shown in context menu
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse')
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java9
2 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 81259e880..e66320af2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -404,7 +404,7 @@ ChangeLogModelProvider_7=Make Changes Unassigned
ChangeLogModelProvider_9=Mark Change Set As De&fault
ChangeLogModelManager_0=Show Change Sets
ChangeSetActionGroup_0=Confirm Remove
-ChangeSetActionGroup_1=Are you sure you want to remove {0}
+ChangeSetActionGroup_1=Are you sure you want to remove {0}?
ChangeSetActionGroup_2=No Set
CommitSetDiffNode_0={0} (default)
FileTypeTable_0=Binary
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
index dcdf60cbe..c413dfff5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2010 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,8 +25,7 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Control;
import org.eclipse.team.core.diff.IDiff;
import org.eclipse.team.core.subscribers.Subscriber;
-import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
-import org.eclipse.team.core.synchronize.SyncInfo;
+import org.eclipse.team.core.synchronize.*;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
import org.eclipse.team.internal.core.subscribers.*;
import org.eclipse.team.internal.ui.TeamUIMessages;
@@ -143,7 +142,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
public void run() {
ActiveChangeSet set = getSelectedSet();
if (set == null) return;
- if (MessageDialog.openConfirm(getConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { set.getTitle() }))) { //
+ if (MessageDialog.openConfirm(getConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { LegacyActionTools.escapeMnemonics(set.getTitle()) }))) { //
getActiveChangeSetManager().remove(set);
}
}
@@ -168,7 +167,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
private final ActiveChangeSet set;
public AddToChangeSetAction(ISynchronizePageConfiguration configuration, ActiveChangeSet set, ISelection selection) {
- super(set == null ? TeamUIMessages.ChangeSetActionGroup_2 : set.getTitle(), configuration);
+ super(set == null ? TeamUIMessages.ChangeSetActionGroup_2 : LegacyActionTools.escapeMnemonics(set.getTitle()), configuration);
this.set = set;
selectionChanged(selection);
}

Back to the top