Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-03-04 17:13:14 -0500
committerjames2002-03-04 17:13:14 -0500
commitcc3930bfa4d2ba8ab9e62f9958659850f469eac9 (patch)
tree61b998628a47d77514be700937a8b31017bbb2e9
parent38655ffa5e35b603d09dd60634b88b2573bd2751 (diff)
downloadeclipse.platform.team-cc3930bfa4d2ba8ab9e62f9958659850f469eac9.tar.gz
eclipse.platform.team-cc3930bfa4d2ba8ab9e62f9958659850f469eac9.tar.xz
eclipse.platform.team-cc3930bfa4d2ba8ab9e62f9958659850f469eac9.zip
8467: Compare/Replace/History not consistent with container histories
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml.off22
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java2
2 files changed, 12 insertions, 12 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
index 2edf67a19..b4e5c7b2f 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
@@ -123,12 +123,6 @@
objectClass="org.eclipse.core.resources.IProject" adaptable="true">
<filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
<action
- id="org.eclipse.team.ccvs.ui.compareWithTag"
- label="%CompareWithTagAction.label"
- tooltip="%CompareWithTagAction.tooltip"
- menubarPath="compareWithMenu/compareWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithTagAction"/>
- <action
id="org.eclipse.team.ccvs.ui.merge"
label="%MergeAction.label"
tooltip="%MergeAction.tooltip"
@@ -140,17 +134,23 @@
tooltip="%BranchAction.tooltip"
menubarPath="team.main/group1"
class="org.eclipse.team.internal.ccvs.ui.actions.BranchAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.IContainerContributions"
- objectClass="org.eclipse.core.resources.IContainer" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
<action
id="org.eclipse.team.ccvs.ui.replaceWithTag"
label="%ReplaceWithTagAction.label"
tooltip="%ReplaceWithTagAction.tooltip"
menubarPath="replaceWithMenu/replaceWithGroup"
class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.IContainerContributions"
+ objectClass="org.eclipse.core.resources.IContainer" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.compareWithTag"
+ label="%CompareWithTagAction.label"
+ tooltip="%CompareWithTagAction.tooltip"
+ menubarPath="compareWithMenu/compareWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithTagAction"/>
<action
id="org.eclipse.team.ccvs.ui.unmanage"
label="%UnmanageFolder.label"
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
index 87220b8d9..3647c3a15 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
@@ -208,7 +208,7 @@ public class TagSelectionDialog extends Dialog {
// initialize the table contents
try {
CVSTeamProvider provider = (CVSTeamProvider)TeamPlugin.getManager().getProvider(resource);
- tagTree.setInput(new ProjectElement((ICVSRemoteFolder)provider.getRemoteResource(resource), getShell()));
+ tagTree.setInput(new ProjectElement((ICVSRemoteFolder)provider.getRemoteResource(resource.getProject()), getShell()));
} catch (TeamException e) {
// To do: error dialog
}

Back to the top