Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/plugin.xml')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/plugin.xml421
1 files changed, 419 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index ddc8431ab..124535c5e 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -106,13 +106,176 @@
allPopups="false"
locationURI="toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar">
<command
+ commandId="org.eclipse.emf.compare.ide.ui.dropdown"
+ icon="icons/full/toolb16/left_to_right.gif"
+ id="org.eclipse.emf.compare.ide.ui.setdropdown"
+ style="pulldown"
+ tooltip="%dropdown.tooltip">
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.acceptChange"
+ icon="icons/full/toolb16/accept_change.gif"
+ label="%accept.change"
+ style="push"
+ tooltip="%accept.change.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.hasReadOnlySide">
+ </test>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.acceptAllChanges"
+ icon="icons/full/toolb16/accept_all_changes.gif"
+ label="%accept.all.changes"
+ style="push"
+ tooltip="%accept.all.changes.tooltip">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.mergedToRight"
+ icon="icons/full/toolb16/merge_to_right.gif"
+ label="%merged.to.right"
+ style="push"
+ tooltip="%merged.to.right.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.mergedAllToRight"
+ icon="icons/full/toolb16/merge_all_to_right.gif"
+ label="%merged.all.to.right"
+ style="push"
+ tooltip="%merged.all.to.right.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </visibleWhen>
+ </command>
+ <separator
+ name="org.eclipse.emf.compare.ide.ui.separatorLeftRight"
+ visible="true">
+ </separator>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.rejectChange"
+ icon="icons/full/toolb16/reject_change.gif"
+ label="%reject.change"
+ style="push"
+ tooltip="%reject.change.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.hasReadOnlySide">
+ </test>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.rejectAllChanges"
+ icon="icons/full/toolb16/reject_all_changes.gif"
+ label="%reject.all.changes"
+ style="push"
+ tooltip="%reject.all.changes.tooltip">
+ <visibleWhen
+ checkEnabled="true">
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.mergedToLeft"
+ icon="icons/full/toolb16/merge_to_left.gif"
+ label="%merged.to.left"
+ style="push"
+ tooltip="%merged.to.left.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.mergedAllToLeft"
+ icon="icons/full/toolb16/merge_all_to_left.gif"
+ label="%merged.all.to.left"
+ style="push"
+ tooltip="%merged.all.to.left.tooltip">
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </visibleWhen>
+ </command>
+ <separator
+ name="org.eclipse.emf.compare.ide.ui.separatorNextPrevDiff"
+ visible="true">
+ </separator>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.nextDiff"
+ icon="icons/full/toolb16/next_diff.gif"
+ label="%next.diff"
+ style="push"
+ tooltip="%next.diff.tooltip">
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.previousDiff"
+ icon="icons/full/toolb16/prev_diff.gif"
+ label="%previous.diff"
+ style="push"
+ tooltip="%previous.diff.tooltip">
+ </command>
+ <separator
+ name="org.eclipse.emf.compare.ide.ui.separatorSave1"
+ visible="true">
+ </separator>
+ <command
commandId="org.eclipse.emf.compare.ide.ui.saveComparisonModel"
icon="icons/full/toolb16/saveas_edit.gif"
- label="%save.model.name"
+ label="%save.model.label"
style="push"
tooltip="%save.model.tooltip">
</command>
</menuContribution>
+ <menuContribution
+ allPopups="false"
+ locationURI="menu:org.eclipse.emf.compare.ide.ui.setdropdown">
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.dropdown.ltr"
+ icon="icons/full/toolb16/left_to_right.gif"
+ style="push">
+ </command>
+ <command
+ commandId="org.eclipse.emf.compare.ide.ui.dropdown.rtl"
+ icon="icons/full/toolb16/right_to_left.gif"
+ style="push">
+ </command>
+ </menuContribution>
</extension>
<extension
point="org.eclipse.ui.commands">
@@ -131,6 +294,58 @@
name="Each Other">
</command>
<command
+ id="org.eclipse.emf.compare.ide.ui.dropdown"
+ name="org.eclipse.emf.compare.ide.ui.dropdown">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.dropdown.ltr"
+ name="Left to Right">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.dropdown.rtl"
+ name="Right to Left">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.acceptChange"
+ name="%accept.change.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.acceptAllChanges"
+ name="%accept.all.changes.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.rejectChange"
+ name="%reject.change.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.rejectAllChanges"
+ name="%reject.all.changes.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.mergedToRight"
+ name="%merged.to.right.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.mergedAllToRight"
+ name="%merged.all.to.right.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.mergedToLeft"
+ name="%merged.to.left.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.mergedAllToLeft"
+ name="%merged.all.to.left.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.nextDiff"
+ name="%next.diff.command.name">
+ </command>
+ <command
+ id="org.eclipse.emf.compare.ide.ui.previousDiff"
+ name="%previous.diff.command.name">
+ </command>
+ <command
id="org.eclipse.emf.compare.ide.ui.saveComparisonModel"
name="%save.model.command.name">
</command>
@@ -216,6 +431,161 @@
</activeWhen>
</handler>
<handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.AcceptChange"
+ commandId="org.eclipse.emf.compare.ide.ui.acceptChange">
+ <activeWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.hasReadOnlySide">
+ </test>
+ </with>
+ </activeWhen>
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <and>
+ <test
+ property="emfcompare.diffSelected">
+ </test>
+ <test
+ property="emfcompare.leftToRightSide">
+ </test>
+ </and>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.AcceptAllChanges"
+ commandId="org.eclipse.emf.compare.ide.ui.acceptAllChanges">
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.hasReadOnlySide">
+ </test>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.RejectChange"
+ commandId="org.eclipse.emf.compare.ide.ui.rejectChange">
+ <activeWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.hasReadOnlySide">
+ </test>
+ </with>
+ </activeWhen>
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <and>
+ <test
+ property="emfcompare.diffSelected">
+ </test>
+ <test
+ property="emfcompare.rightToLeftSide">
+ </test>
+ </and>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.RejectAllChanges"
+ commandId="org.eclipse.emf.compare.ide.ui.rejectAllChanges">
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.hasReadOnlySide">
+ </test>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.MergedToRight"
+ commandId="org.eclipse.emf.compare.ide.ui.mergedToRight">
+ <activeWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </activeWhen>
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <and>
+ <test
+ property="emfcompare.diffSelected">
+ </test>
+ <test
+ property="emfcompare.leftToRightSide">
+ </test>
+ </and>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.MergedAllToRight"
+ commandId="org.eclipse.emf.compare.ide.ui.mergedAllToRight">
+ <activeWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.MergedToLeft"
+ commandId="org.eclipse.emf.compare.ide.ui.mergedToLeft">
+ <activeWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with>
+ </activeWhen>
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <and>
+ <test
+ property="emfcompare.diffSelected">
+ </test>
+ <test
+ property="emfcompare.rightToLeftSide">
+ </test>
+ </and>
+ </with>
+ </enabledWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.MergedAllToLeft"
+ commandId="org.eclipse.emf.compare.ide.ui.mergedAllToLeft">
+ <activeWhen>
+ <with
+ variable="activeEditor">
+ <test
+ property="emfcompare.bothSidesWriteable">
+ </test>
+ </with></activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.SelectNextDiff"
+ commandId="org.eclipse.emf.compare.ide.ui.nextDiff">
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.SelectPreviousDiff"
+ commandId="org.eclipse.emf.compare.ide.ui.previousDiff">
+ </handler>
+ <handler
class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.SaveComparisonModel"
commandId="org.eclipse.emf.compare.ide.ui.saveComparisonModel">
<enabledWhen>
@@ -228,6 +598,18 @@
</enabledWhen>
</handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.DropDownHandler"
+ commandId="org.eclipse.emf.compare.ide.ui.dropdown">
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.DropDownLeftToRight"
+ commandId="org.eclipse.emf.compare.ide.ui.dropdown.ltr">
+ </handler>
+ <handler
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.DropDownRightToLeft"
+ commandId="org.eclipse.emf.compare.ide.ui.dropdown.rtl">
+ </handler>
</extension>
<extension
id="org.eclipse.emf.compare.model.provider"
@@ -259,12 +641,47 @@
<extension
point="org.eclipse.core.expressions.propertyTesters">
<propertyTester
- class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.ModelSaveablePropertyTester"
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.propertytester.ModelSaveablePropertyTester"
id="org.eclipse.emf.compare.ide.ui.modelSaveable"
namespace="emfcompare"
properties="isSaveable"
type="java.lang.Object">
</propertyTester>
+ <propertyTester
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.propertytester.AcceptRejectChangePropertyTester"
+ id="org.eclipse.emf.compare.ide.ui.hasReadOnlySide"
+ namespace="emfcompare"
+ properties="hasReadOnlySide"
+ type="java.lang.Object">
+ </propertyTester>
+ <propertyTester
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.propertytester.MergedToPropertyTester"
+ id="org.eclipse.emf.compare.ide.ui.bothSidesWriteable"
+ namespace="emfcompare"
+ properties="bothSidesWriteable"
+ type="java.lang.Object">
+ </propertyTester>
+ <propertyTester
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.propertytester.DiffSelectedPropertyTester"
+ id="org.eclipse.emf.compare.ide.ui.diffSelected"
+ namespace="emfcompare"
+ properties="diffSelected"
+ type="java.lang.Object">
+ </propertyTester>
+ <propertyTester
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.propertytester.LeftToRightSidePropertyTester"
+ id="org.eclipse.emf.compare.ide.ui.leftToRightSide"
+ namespace="emfcompare"
+ properties="leftToRightSide"
+ type="java.lang.Object">
+ </propertyTester>
+ <propertyTester
+ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.propertytester.RightToLeftSidePropertyTester"
+ id="org.eclipse.emf.compare.ide.ui.rightToLeftSide"
+ namespace="emfcompare"
+ properties="rightToLeftSide"
+ type="java.lang.Object">
+ </propertyTester>
</extension>
<extension
point="org.eclipse.emf.compare.ide.ui.modelResolvers">

Back to the top