diff options
author | Michael Valenta | 2007-04-13 21:33:43 +0000 |
---|---|---|
committer | Michael Valenta | 2007-04-13 21:33:43 +0000 |
commit | a8e3c4cd257005480283bf53d1d34822bc9d3edf (patch) | |
tree | c5d9625e151344c51106ab9e2ae3fdd52889c643 /bundles/org.eclipse.team.cvs.ui | |
parent | 7673d2acea9b5d0d8d630b382949b9acdef5ca10 (diff) | |
download | eclipse.platform.team-a8e3c4cd257005480283bf53d1d34822bc9d3edf.tar.gz eclipse.platform.team-a8e3c4cd257005480283bf53d1d34822bc9d3edf.tar.xz eclipse.platform.team-a8e3c4cd257005480283bf53d1d34822bc9d3edf.zip |
Bug 182267 "Add Date..." button shouldn't be visible in merge wizard
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java index 1b7c77920..a488c0320 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionArea.java @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Brock Janiczak <brockj@tpg.com.au> - Bug 182267 "Add Date..." button shouldn't be visible in merge wizard *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.tags; @@ -307,12 +308,16 @@ public class TagSelectionArea extends DialogArea { protected void createRefreshButtons(Composite parent) { tagSource.addListener(listener); parent.addDisposeListener(disposeListener); - tagRefreshArea = new TagRefreshButtonArea(shell, tagSource, new Listener() { - public void handleEvent(Event event) { - CVSTag dateTag = NewDateTagAction.getDateTag(getShell(), getLocation()); - addDateTag(dateTag); - } - }); + Listener listener = null; + if ((includeFlags & TagSourceWorkbenchAdapter.INCLUDE_DATES) != 0) { + listener = new Listener() { + public void handleEvent(Event event) { + CVSTag dateTag = NewDateTagAction.getDateTag(getShell(), getLocation()); + addDateTag(dateTag); + } + }; + } + tagRefreshArea = new TagRefreshButtonArea(shell, tagSource, listener); if (context != null) tagRefreshArea.setRunnableContext(context); tagRefreshArea.createArea(parent); |