Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-03-03 08:47:57 +0000
committerEike Stepper2015-03-03 08:47:57 +0000
commit7d5e61c1d3adac069099c2cf3a18a887cf3557f9 (patch)
treedcb0c7616c439717d432d5858015ebc87b7fb16d /plugins/org.eclipse.emf.cdo.ui
parentccb8bd19f7bca4ff9b9a177392be7160edfbb630 (diff)
downloadcdo-7d5e61c1d3adac069099c2cf3a18a887cf3557f9.tar.gz
cdo-7d5e61c1d3adac069099c2cf3a18a887cf3557f9.tar.xz
cdo-7d5e61c1d3adac069099c2cf3a18a887cf3557f9.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/plugin.xml18
1 files changed, 4 insertions, 14 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
index 2dac1dd080..8e3aeda021 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.xml
@@ -346,7 +346,7 @@
<extension point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?group=group.new.branch">
+ locationURI="popup:org.eclipse.ui.popup.any?after=group.new.branch">
<command
commandId="org.eclipse.emf.cdo.ui.CreateBranch"
icon="icons/full/obj16/branch.gif"
@@ -364,7 +364,7 @@
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?group=additions">
+ locationURI="popup:org.eclipse.ui.popup.any?after=additions">
<command
commandId="org.eclipse.emf.cdo.ui.LockObject"
icon="icons/full/elcl16/lock.gif"
@@ -376,6 +376,7 @@
<iterate>
<and>
<adapt type="org.eclipse.emf.ecore.EObject"/>
+ <test property="org.eclipse.emf.cdo.object.transactional" value="true"/>
<test property="org.eclipse.emf.cdo.object.writeLocked" value="false"/>
<test property="org.eclipse.emf.cdo.object.writeLockedByOthers" value="false"/>
</and>
@@ -383,10 +384,6 @@
</with>
</visibleWhen>
</command>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?group=additions">
<command
commandId="org.eclipse.emf.cdo.ui.LockTree"
icon="icons/full/elcl16/lock.gif"
@@ -398,6 +395,7 @@
<iterate>
<and>
<adapt type="org.eclipse.emf.ecore.EObject"/>
+ <test property="org.eclipse.emf.cdo.object.transactional" value="true"/>
<test property="org.eclipse.emf.cdo.object.writeLocked" value="false"/>
<test property="org.eclipse.emf.cdo.object.writeLockedByOthers" value="false"/>
<test property="org.eclipse.emf.cdo.object.children" value="true"/>
@@ -407,10 +405,6 @@
</visibleWhen>
</command>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?group=additions">
<command
commandId="org.eclipse.emf.cdo.ui.UnlockObject"
icon="icons/full/elcl16/unlock.gif"
@@ -428,10 +422,6 @@
</with>
</visibleWhen>
</command>
- </menuContribution>
- <menuContribution
- allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?group=additions">
<command
commandId="org.eclipse.emf.cdo.ui.UnlockTree"
icon="icons/full/elcl16/unlock.gif"

Back to the top