Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/plugin.properties3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/plugin.xml18
2 files changed, 6 insertions, 15 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
index 84b0b5d93..e9dfd824b 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2006, 2014 Obeo.
+# Copyright (c) 2006, 2016 Obeo.
# 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
@@ -24,6 +24,7 @@ emf.compare.no.differences.viewer= No differences
emf.compare.no.visible.item.viewer= No visible item
command.each.other.in.dialog = Each Other <EObject> (in Dialog)
command.each.other.in.editor = Each Other <EObject> (in Editor)
+command.each.other.emfComparisonSource = Each Other (EMF Compare)
compare.with.label = Compare With
resolver.threadedModelResolver.label = Cross reference resolver
resolver.threadedModelResolver.description = Resolve the cross referenced resources of the selected resource, then crawl the given scope for incoming references to that resource, by default, only crawls the selected file's container.
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index bb2e50e29..1b56feaae 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -244,7 +244,7 @@
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any">
+ locationURI="popup:org.eclipse.ui.popup.any?after=additions">
<menu
id="compareWithMenu"
label="%compare.with.label">
@@ -477,27 +477,17 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?after=additions">
- <menu
- id="compareWithMenu"
- label="Compare With">
- <separator
- name="compareWithGroup">
- </separator>
- </menu>
- </menuContribution>
- <menuContribution
- allPopups="false"
locationURI="popup:compareWithMenu?after=compareWithGroup">
<command
commandId="org.eclipse.emf.compare.ide.ui.emfComparisonSourceCompareCommand"
- label="Each Other (EMFCompare)"
+ label="%command.each.other.emfComparisonSource"
style="push">
<visibleWhen
checkEnabled="false">
<with
variable="activeMenuSelection">
- <iterate>
+ <iterate
+ ifEmpty="false">
<and>
<adapt
type="org.eclipse.emf.compare.ide.ui.source.IEMFComparisonSource">

Back to the top