[540751] Fix menu entries broken by Bug 533254 work6.5.1M2

4 files changed, 15 insertions, 15 deletions

diff --git a/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.xml b/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.xml
index 90342b37c5..a69003598d 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.xml
+++ b/plugins/org.eclipse.ocl.xtext.completeocl.ui/plugin.xml
@@ -88,7 +88,7 @@
     </extension>
     <extension point="org.eclipse.ui.menus">
         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
+            locationURI="popup:#CompleteOCLEditorContext?after=group.edit">
              <command
                  commandId="org.eclipse.ocl.xtext.completeocl.CompleteOCL.validate"
                  style="push"
@@ -102,7 +102,7 @@
          </menuContribution>
     </extension>
     <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+		<menuContribution locationURI="popup:#CompleteOCLEditorContext?endof=group.find">
 			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
 				<visibleWhen checkEnabled="false">
                 	<reference definitionId="org.eclipse.ocl.xtext.completeocl.CompleteOCL.Editor.opened">
@@ -170,7 +170,7 @@
 	</extension>
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
+			locationURI="popup:#CompleteOCLEditorContext?after=group.open">
 			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
 				style="push"
 				tooltip="%MF_OpenQuickOutline">
@@ -224,7 +224,7 @@
 		<!--
            	locationURI="popup:org.eclipse.ui.popup.any?after=additions">
 			locationURI="popup:org.eclipse.ui.menus.showInMenu" TextEditor, Xtexteditor, not Ecore editor
-			locationURI="popup:#TextEditorContext?after=group.open"  TextEditor, Xtexteditor, not Ecore editor
+			locationURI="popup:#CompleteOCLEditorContext?after=group.open"  TextEditor, Xtexteditor, not Ecore editor
 		-->
 	</extension>
 
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.xml b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.xml
index 6c0b70b256..ce3647cce1 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.xml
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl.ui/plugin.xml
@@ -91,7 +91,7 @@
     </extension>
     <extension point="org.eclipse.ui.menus">
         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
+            locationURI="popup:#EssentialOCLEditorContext?after=group.edit">
              <command
                  commandId="org.eclipse.ocl.xtext.essentialocl.EssentialOCL.validate"
                  style="push"
@@ -105,7 +105,7 @@
          </menuContribution>
     </extension>
     <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+		<menuContribution locationURI="popup:#EssentialOCLEditorContext?endof=group.find">
 			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
 				<visibleWhen checkEnabled="false">
                 	<reference definitionId="org.eclipse.ocl.xtext.essentialocl.EssentialOCL.Editor.opened">
@@ -190,7 +190,7 @@
 	</extension>
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
+			locationURI="popup:#EssentialOCLEditorContext?after=group.open">
 			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
 				style="push"
 				tooltip="%MF_OpenQuickOutline">
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.xml b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.xml
index 53a81035d9..e046e208d2 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.xml
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore.ui/plugin.xml
@@ -87,7 +87,7 @@
     </extension>
     <extension point="org.eclipse.ui.menus">
         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
+            locationURI="popup:#OCLinEcoreEditorContext?after=group.edit">
              <command
                  commandId="org.eclipse.ocl.xtext.oclinecore.OCLinEcore.validate"
                  style="push"
@@ -101,7 +101,7 @@
          </menuContribution>
     </extension>
     <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+		<menuContribution locationURI="popup:#OCLinEcoreEditorContext?endof=group.find">
 			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
 				<visibleWhen checkEnabled="false">
                 	<reference definitionId="org.eclipse.ocl.xtext.oclinecore.OCLinEcore.Editor.opened">
@@ -169,7 +169,7 @@
 	</extension>
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
+			locationURI="popup:#OCLinEcoreEditorContext?after=group.open">
 			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
 				style="push"
 				tooltip="%MF_OpenQuickOutline">
@@ -292,7 +292,7 @@
             </visibleWhen>
 	    </command-->
 	  </menuContribution>
-	  <menuContribution locationURI="popup:#TextEditorContext?after=group.rest">
+	  <menuContribution locationURI="popup:#OCLinEcoreEditorContext?after=group.rest">
 	    <command commandId="org.eclipse.ocl.xtext.oclinecore.ui.outline.CreateDynamicInstanceCommand"
 	      label="%MF_CreateDynamicInstance">
             <visibleWhen checkEnabled="false">
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.xml b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.xml
index f666d84d3d..683fa519d6 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.xml
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib.ui/plugin.xml
@@ -98,7 +98,7 @@
     </extension>
     <extension point="org.eclipse.ui.menus">
         <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
+            locationURI="popup:#OCLstdlibEditorContext?after=group.edit">
              <command
                  commandId="org.eclipse.ocl.xtext.oclstdlib.OCLstdlib.validate"
                  style="push"
@@ -112,7 +112,7 @@
          </menuContribution>
     </extension>
     <extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+		<menuContribution locationURI="popup:#OCLstdlibEditorContext?endof=group.find">
 			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
 				<visibleWhen checkEnabled="false">
                 	<reference definitionId="org.eclipse.ocl.xtext.oclstdlib.OCLstdlib.Editor.opened">
@@ -180,7 +180,7 @@
 	</extension>
 	<extension point="org.eclipse.ui.menus">
 		<menuContribution
-			locationURI="popup:#TextEditorContext?after=group.open">
+			locationURI="popup:#OCLstdlibEditorContext?after=group.open">
 			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
 				style="push"
 				tooltip="%MF_OpenQuickOutline">
@@ -216,7 +216,7 @@
 	</extension>
     <extension point="org.eclipse.ui.menus">
          <menuContribution
-            locationURI="popup:#TextEditorContext?after=group.edit">
+            locationURI="popup:#OCLstdlibEditorContext?after=group.edit">
          <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
                style="push">
             <visibleWhen checkEnabled="false">