Changed the cvs decorator to extend the workbench decorator and not the

team decorator

2 files changed, 38 insertions, 22 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.properties b/bundles/org.eclipse.team.cvs.ui/plugin.properties
index 91c849baf..36d8710e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.properties
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.properties
@@ -2,6 +2,8 @@ pluginName=CVS Team Provider UI
 
 CVS=CVS
 
+CVSGroupMenu.label=CVS
+
 ConfigurationWizard.name=CVS
 
 PreferencePage.name=CVS
@@ -84,10 +86,10 @@ CheckoutAction.tooltip=Check out a module from a CVS repository
 GenerateDiff.label=&Create Patch...
 GenerateDiff.tooltip=Compare your workspace contents against the server and generate a diff file that can be used as a patch file.
 
-RefreshFromLocal.label=&Refresh From Local CVS State
+RefreshFromLocal.label=&Refresh from local CVS state
 RefreshFromLocal.tooltip=Refresh the workbench with changes made to CVS projects from outside the workbench.
 
-Synchronize.label=&Synchronize With Repository...
+Synchronize.label=&Synchronize with Repository...
 Synchronize.tooltip=Synchronize the workspace resources with the resources in the repository
 
 Delete.label=Delete
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
index 393222e5c..116d7f669 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
@@ -57,41 +57,36 @@
 			id="org.eclipse.team.ccvs.ui.ResourceContributions" 

 			objectClass="org.eclipse.core.resources.IResource" adaptable="true"> 

 			<filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>

-			<action 

-				id="org.eclipse.team.ccvs.ui.showHistory"

-				label="%ShowHistoryAction.label"

-				tooltip="%ShowHistoryAction.tooltip"

-				menubarPath="team.main/advancedGroup"

-				class="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction"/>

-			<action

-				id="org.eclipse.team.ccvs.ui.GenerateDiff"

-				label="%GenerateDiff.label"

-				tooltip="%GenerateDiff.tooltip"

-				menubarPath="team.main/advancedGroup"

-				class="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction"/>

+			<menu

+				id="cvs.main"

+				path="additions"

+				label="%CVSGroupMenu.label">

+				<separator name="nativeGroup"/>

+				<separator name="enhancedGroup"/>

+			</menu>

 			<action 

 				id="org.eclipse.team.ccvs.ui.refreshFromLocal"

 				label="%RefreshFromLocal.label"

 				tooltip="%RefreshFromLocal.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.RefreshFromLocalAction"/>

 			<action 

 				id="org.eclipse.team.ccvs.ui.branch"

 				label="%BranchAction.label"

 				tooltip="%BranchAction.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.BranchAction"/>

 			<action 

 				id="org.eclipse.team.ccvs.ui.tag"

 				label="%TagAction.label"

 				tooltip="%TagAction.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.TagAction"/>

 			<action 

 				id="org.eclipse.team.ccvs.ui.add"

 				label="%AddAction.label"

 				tooltip="%AddAction.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.AddAction"/>

 			<action 

 				id="org.eclipse.team.ccvs.ui.compareWithRemote"

@@ -103,7 +98,7 @@
 				id="org.eclipse.team.ccvs.ui.update"

 				label="%UpdateAction.label"

 				tooltip="%UpdateAction.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.UpdateAction"/>

 			<action 

 				id="org.eclipse.team.ccvs.ui.replace"

@@ -115,13 +110,25 @@
 				id="org.eclipse.team.ccvs.ui.commit"

 				label="%CommitAction.label"

 				tooltip="%CommitAction.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.CommitAction"/>

 			<action

+				id="org.eclipse.team.ccvs.ui.GenerateDiff"

+				label="%GenerateDiff.label"

+				tooltip="%GenerateDiff.tooltip"

+				menubarPath="cvs.main/nativeGroup"

+				class="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction"/>	

+			<action 

+				id="org.eclipse.team.ccvs.ui.showHistory"

+				label="%ShowHistoryAction.label"

+				tooltip="%ShowHistoryAction.tooltip"

+				menubarPath="cvs.main/nativeGroup"

+				class="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction"/>

+			<action

 				id="org.eclipse.team.ccvs.ui.sync"

 				label="%Synchronize.label"

 				tooltip="%Synchronize.tooltip"

-				menubarPath="team.main/advancedGroup"

+				menubarPath="cvs.main/nativeGroup"

 				class="org.eclipse.team.internal.ccvs.ui.actions.SyncAction"/>

 		</objectContribution>

 		<objectContribution

@@ -145,11 +152,18 @@
 			id="org.eclipse.team.ccvs.ui.IFileContributions"

 			objectClass="org.eclipse.core.resources.IFile" adaptable="true">

 			<filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>

+			<menu

+				id="cvs.main"

+				path="additions"

+				label="%CVSGroupMenu.label">

+				<separator name="nativeGroup"/>

+				<separator name="enhancedGroup"/>

+			</menu>

 			<action

 				id="org.eclipse.team.ccvs.ui.delete"

 				label="%Delete.label"

 				tooltip="%Delete.tooltip"

-				menubarPath="team.main/checkinGroup"

+				menubarPath="cvs.main/enhancedGroup"

 				class="org.eclipse.team.ui.actions.DeleteAction"/>

 			<action 

 				id="org.eclipse.team.ccvs.ui.compareWithRevision"