aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2014-02-12 16:59:21 (EST)
committerGerrit Code Review @ Eclipse.org2014-02-26 08:38:33 (EST)
commitf65e473bac989fc1d559242fbda5d4bff6a9d3e7 (patch)
treecde6881074e8e38cc8a4050e209d6f7373d6b996
parent5809b60ffce296a7dd47c22bd23c66d635946e55 (diff)
downloadeclipse.platform.ui-f65e473bac989fc1d559242fbda5d4bff6a9d3e7.zip
eclipse.platform.ui-f65e473bac989fc1d559242fbda5d4bff6a9d3e7.tar.gz
eclipse.platform.ui-f65e473bac989fc1d559242fbda5d4bff6a9d3e7.tar.bz2
bug 402764: Remove the MOpaque* and MRendered* model classes refs/changes/74/20674/7
0) All Eric's changes 1) Fix toolbar rendering. 2) Translate MOpaque* and MRendered* instances found in old models to new equivalents on load. 3) Remove MOpaque* and MRendered* classes and implementations from model and generated code. 4) Get ride of hard-coded magic values Change-Id: I844a17a7b631048ac0e52f99cd9f953c3dd08737
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/.settings/.api_filters189
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore73
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.java63
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenu.java32
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuItem.java67
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuSeparator.java67
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueToolItem.java67
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenu.java67
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenuItem.java67
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedToolBar.java67
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.java99
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java2251
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuImpl.java45
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuItemImpl.java166
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuSeparatorImpl.java165
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueToolItemImpl.java166
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuImpl.java166
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuItemImpl.java166
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedToolBarImpl.java166
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.java155
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.java223
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentsImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/DirectContributionItem.java12
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java10
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java80
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java16
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java34
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolItemRenderer.java12
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4XMIResource.java93
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/OpaqueElementUtil.java163
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/RenderedElementUtil.java115
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java6
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java22
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java4
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java17
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java21
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java16
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java9
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java13
40 files changed, 588 insertions, 4588 deletions
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/.settings/.api_filters b/bundles/org.eclipse.e4.ui.model.workbench/.settings/.api_filters
index 081b512..e996af9 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/.settings/.api_filters
+++ b/bundles/org.eclipse.e4.ui.model.workbench/.settings/.api_filters
@@ -13,6 +13,62 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar">
+ <filter comment="Remove MRendered* and MOpaque* from workbench model" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar"/>
+ <message_argument value="org.eclipse.e4.ui.model.workbench_1.1.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/e4/ui/model/application/MAddon.java" type="org.eclipse.e4.ui.model.application.MAddon">
<filter comment="Forgot to add @noimplement in 1.0" id="403853384">
<message_arguments>
@@ -468,145 +524,68 @@
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MMenuItem.java" type="org.eclipse.e4.ui.model.application.ui.menu.MMenuItem">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuItem"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator.java" type="org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
+ <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.java" type="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createOpaqueMenu()"/>
</message_arguments>
</filter>
- </resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenu.java" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createOpaqueMenuItem()"/>
</message_arguments>
</filter>
- </resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuItem.java" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createOpaqueMenuSeparator()"/>
</message_arguments>
</filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem"/>
- <message_argument value="getOpaqueItem()"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createOpaqueToolItem()"/>
</message_arguments>
</filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem"/>
- <message_argument value="setOpaqueItem(Object)"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createRenderedMenu()"/>
</message_arguments>
</filter>
- </resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuSeparator.java" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createRenderedMenuItem()"/>
</message_arguments>
</filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
+ <filter comment="MOpaque* and MRendered* classes removed, see bug 402764." id="405901410">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator"/>
- <message_argument value="getOpaqueItem()"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator"/>
- <message_argument value="setOpaqueItem(Object)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueToolItem.java" type="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem"/>
- <message_argument value="getOpaqueItem()"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem"/>
- <message_argument value="setOpaqueItem(Object)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MPopupMenu.java" type="org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu">
- <filter comment="Forgot to add @noimplement in 1.0" id="403853384">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory"/>
+ <message_argument value="createRenderedToolBar()"/>
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenu.java" type="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu">
+ <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MMenuItem.java" type="org.eclipse.e4.ui.model.application.ui.menu.MMenuItem">
<filter comment="Forgot to add @noimplement in 1.0" id="403853384">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu"/>
- <message_argument value="getContributionManager()"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu"/>
- <message_argument value="setContributionManager(Object)"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuItem"/>
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenuItem.java" type="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem">
+ <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MMenuSeparator.java" type="org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator">
<filter comment="Forgot to add @noimplement in 1.0" id="403853384">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem"/>
- <message_argument value="getContributionItem()"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem"/>
- <message_argument value="setContributionItem(Object)"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator"/>
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedToolBar.java" type="org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar">
+ <resource path="src/org/eclipse/e4/ui/model/application/ui/menu/MPopupMenu.java" type="org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu">
<filter comment="Forgot to add @noimplement in 1.0" id="403853384">
<message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar"/>
- <message_argument value="getContributionManager()"/>
- </message_arguments>
- </filter>
- <filter comment="Bug 411257 - .api_description files in Kepler release do not contain @noreference" id="406052990">
- <message_arguments>
- <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar"/>
- <message_argument value="setContributionManager(Object)"/>
+ <message_argument value="org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu"/>
</message_arguments>
</filter>
</resource>
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
index d53852e..1c70b85 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
@@ -767,30 +767,6 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RenderedMenu" eSuperTypes="#//ui/menu/Menu">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MMenu&#xD;&#xA;@noreference&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionManager"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RenderedToolBar" eSuperTypes="#//ui/menu/ToolBar">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MToolBar&#xD;&#xA;@noreference&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionManager"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ToolBarContribution">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;p>&#xD;&#xA;Provisional for 4.3. This represents a potential extension to some toolbar already&#xD;&#xA;defined in the UI.&#xD;&#xA;&lt;/p>&#xD;&#xA;@noreference This interface is not intended to be referenced by clients.&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
@@ -851,55 +827,6 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RenderedMenuItem" eSuperTypes="#//ui/menu/MenuItem">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MMenuItem&#xD;&#xA;@noreference This interface is not intended to be referenced by clients.&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OpaqueToolItem" eSuperTypes="#//ui/menu/ToolItem">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MMenuItem&#xD;&#xA;@noreference This interface is not intended to be referenced by clients.&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenuItem" eSuperTypes="#//ui/menu/MenuItem">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MMenuItem&#xD;&#xA;@noreference This interface is not intended to be referenced by clients.&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenuSeparator" eSuperTypes="#//ui/menu/MenuSeparator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MMenuItem&#xD;&#xA;@noreference This interface is not intended to be referenced by clients.&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenu" eSuperTypes="#//ui/menu/Menu">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Do no use! This class will be removed at the beginning of Luna (4.4) development.&#xD;&#xA;@deprecated Use MMenuItem&#xD;&#xA;@noreference This interface is not intended to be referenced by clients.&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
- </eAnnotations>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DynamicMenuContribution" eSuperTypes="#//ui/menu/MenuItem #//Contribution">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;p>&#xD;&#xA;This is a concrete class used to represent a menu item that replaces itself through&#xD;&#xA;the execution of the associated client code. The supplied contribution will&#xA;provide the appropriate MMenuElement model elements when queried.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0&#xD;&#xA;@noimplement This interface is not intended to be implemented by clients."/>
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.java
index b9b03c5..9cc7fdc 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MMenuFactory.java
@@ -128,24 +128,6 @@ public interface MMenuFactory {
MToolBarSeparator createToolBarSeparator();
/**
- * Returns a new object of class '<em>Rendered Menu</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Rendered Menu</em>'.
- * @generated
- */
- MRenderedMenu createRenderedMenu();
-
- /**
- * Returns a new object of class '<em>Rendered Tool Bar</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Rendered Tool Bar</em>'.
- * @generated
- */
- MRenderedToolBar createRenderedToolBar();
-
- /**
* Returns a new object of class '<em>Tool Bar Contribution</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -164,51 +146,6 @@ public interface MMenuFactory {
MTrimContribution createTrimContribution();
/**
- * Returns a new object of class '<em>Rendered Menu Item</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Rendered Menu Item</em>'.
- * @generated
- */
- MRenderedMenuItem createRenderedMenuItem();
-
- /**
- * Returns a new object of class '<em>Opaque Tool Item</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Opaque Tool Item</em>'.
- * @generated
- */
- MOpaqueToolItem createOpaqueToolItem();
-
- /**
- * Returns a new object of class '<em>Opaque Menu Item</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Opaque Menu Item</em>'.
- * @generated
- */
- MOpaqueMenuItem createOpaqueMenuItem();
-
- /**
- * Returns a new object of class '<em>Opaque Menu Separator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Opaque Menu Separator</em>'.
- * @generated
- */
- MOpaqueMenuSeparator createOpaqueMenuSeparator();
-
- /**
- * Returns a new object of class '<em>Opaque Menu</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Opaque Menu</em>'.
- * @generated
- */
- MOpaqueMenu createOpaqueMenu();
-
- /**
* Returns a new object of class '<em>Dynamic Menu Contribution</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenu.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenu.java
deleted file mode 100644
index 4f36ec6..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenu.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Opaque Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MMenuItem
- * @noreference This interface is not intended to be referenced by clients.
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- *
- * @model
- * @generated
- */
-public interface MOpaqueMenu extends MMenu {
-} // MOpaqueMenu
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuItem.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuItem.java
deleted file mode 100644
index 4608f0b..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuItem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Opaque Menu Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MMenuItem
- * @noreference This interface is not intended to be referenced by clients.
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem#getOpaqueItem <em>Opaque Item</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MOpaqueMenuItem extends MMenuItem {
- /**
- * Returns the value of the '<em><b>Opaque Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
- * </p>
- * <!-- end-model-doc -->
- * @return the value of the '<em>Opaque Item</em>' attribute.
- * @see #setOpaqueItem(Object)
- * @model transient="true"
- * @generated
- */
- Object getOpaqueItem();
-
- /**
- * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem#getOpaqueItem <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Opaque Item</em>' attribute.
- * @see #getOpaqueItem()
- * @generated
- */
- void setOpaqueItem(Object value);
-
-} // MOpaqueMenuItem
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuSeparator.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuSeparator.java
deleted file mode 100644
index 39dbc5b..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueMenuSeparator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Opaque Menu Separator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MMenuItem
- * @noreference This interface is not intended to be referenced by clients.
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator#getOpaqueItem <em>Opaque Item</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MOpaqueMenuSeparator extends MMenuSeparator {
-
- /**
- * Returns the value of the '<em><b>Opaque Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
- * </p>
- * <!-- end-model-doc -->
- * @return the value of the '<em>Opaque Item</em>' attribute.
- * @see #setOpaqueItem(Object)
- * @model transient="true"
- * @generated
- */
- Object getOpaqueItem();
-
- /**
- * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator#getOpaqueItem <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Opaque Item</em>' attribute.
- * @see #getOpaqueItem()
- * @generated
- */
- void setOpaqueItem(Object value);
-} // MOpaqueMenuSeparator
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueToolItem.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueToolItem.java
deleted file mode 100644
index a21a479..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MOpaqueToolItem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Opaque Tool Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MMenuItem
- * @noreference This interface is not intended to be referenced by clients.
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem#getOpaqueItem <em>Opaque Item</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MOpaqueToolItem extends MToolItem {
- /**
- * Returns the value of the '<em><b>Opaque Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
- * </p>
- * <!-- end-model-doc -->
- * @return the value of the '<em>Opaque Item</em>' attribute.
- * @see #setOpaqueItem(Object)
- * @model transient="true"
- * @generated
- */
- Object getOpaqueItem();
-
- /**
- * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem#getOpaqueItem <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Opaque Item</em>' attribute.
- * @see #getOpaqueItem()
- * @generated
- */
- void setOpaqueItem(Object value);
-
-} // MOpaqueToolItem
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenu.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenu.java
deleted file mode 100644
index 459e5b4..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenu.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rendered Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MMenu
- * @noreference
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu#getContributionManager <em>Contribution Manager</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MRenderedMenu extends MMenu {
- /**
- * Returns the value of the '<em><b>Contribution Manager</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
- * </p>
- * <!-- end-model-doc -->
- * @return the value of the '<em>Contribution Manager</em>' attribute.
- * @see #setContributionManager(Object)
- * @model transient="true"
- * @generated
- */
- Object getContributionManager();
-
- /**
- * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu#getContributionManager <em>Contribution Manager</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Contribution Manager</em>' attribute.
- * @see #getContributionManager()
- * @generated
- */
- void setContributionManager(Object value);
-
-} // MRenderedMenu
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenuItem.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenuItem.java
deleted file mode 100644
index 499b167..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedMenuItem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rendered Menu Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MMenuItem
- * @noreference This interface is not intended to be referenced by clients.
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem#getContributionItem <em>Contribution Item</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MRenderedMenuItem extends MMenuItem {
- /**
- * Returns the value of the '<em><b>Contribution Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
- * </p>
- * <!-- end-model-doc -->
- * @return the value of the '<em>Contribution Item</em>' attribute.
- * @see #setContributionItem(Object)
- * @model transient="true"
- * @generated
- */
- Object getContributionItem();
-
- /**
- * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem#getContributionItem <em>Contribution Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Contribution Item</em>' attribute.
- * @see #getContributionItem()
- * @generated
- */
- void setContributionItem(Object value);
-
-} // MRenderedMenuItem
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedToolBar.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedToolBar.java
deleted file mode 100644
index d9c5201..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/MRenderedToolBar.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2008, 2013 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rendered Tool Bar</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Do no use! This class will be removed at the beginning of Luna (4.4) development.
- * @deprecated Use MToolBar
- * @noreference
- * @since 1.0
- * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar#getContributionManager <em>Contribution Manager</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MRenderedToolBar extends MToolBar {
- /**
- * Returns the value of the '<em><b>Contribution Manager</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <p>
- * <strong>Developers</strong>:
- * Add more detailed documentation by editing this comment in
- * org.eclipse.ui.model.workbench/model/UIElements.ecore.
- * There is a GenModel/documentation node under each type and attribute.
- * </p>
- * <!-- end-model-doc -->
- * @return the value of the '<em>Contribution Manager</em>' attribute.
- * @see #setContributionManager(Object)
- * @model transient="true"
- * @generated
- */
- Object getContributionManager();
-
- /**
- * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar#getContributionManager <em>Contribution Manager</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Contribution Manager</em>' attribute.
- * @see #getContributionManager()
- * @generated
- */
- void setContributionManager(Object value);
-
-} // MRenderedToolBar
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.java
index 1067803..de3ce54 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuFactoryImpl.java
@@ -11,28 +11,6 @@
package org.eclipse.e4.ui.model.application.ui.menu.impl;
import org.eclipse.e4.ui.model.application.ui.menu.*;
-import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
@@ -103,15 +81,8 @@ public class MenuFactoryImpl extends EFactoryImpl implements MMenuFactory {
case MenuPackageImpl.HANDLED_TOOL_ITEM: return (EObject)createHandledToolItem();
case MenuPackageImpl.DIRECT_TOOL_ITEM: return (EObject)createDirectToolItem();
case MenuPackageImpl.TOOL_BAR_SEPARATOR: return (EObject)createToolBarSeparator();
- case MenuPackageImpl.RENDERED_MENU: return (EObject)createRenderedMenu();
- case MenuPackageImpl.RENDERED_TOOL_BAR: return (EObject)createRenderedToolBar();
case MenuPackageImpl.TOOL_BAR_CONTRIBUTION: return (EObject)createToolBarContribution();
case MenuPackageImpl.TRIM_CONTRIBUTION: return (EObject)createTrimContribution();
- case MenuPackageImpl.RENDERED_MENU_ITEM: return (EObject)createRenderedMenuItem();
- case MenuPackageImpl.OPAQUE_TOOL_ITEM: return (EObject)createOpaqueToolItem();
- case MenuPackageImpl.OPAQUE_MENU_ITEM: return (EObject)createOpaqueMenuItem();
- case MenuPackageImpl.OPAQUE_MENU_SEPARATOR: return (EObject)createOpaqueMenuSeparator();
- case MenuPackageImpl.OPAQUE_MENU: return (EObject)createOpaqueMenu();
case MenuPackageImpl.DYNAMIC_MENU_CONTRIBUTION: return (EObject)createDynamicMenuContribution();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -263,26 +234,6 @@ public class MenuFactoryImpl extends EFactoryImpl implements MMenuFactory {
* <!-- end-user-doc -->
* @generated
*/
- public MRenderedMenu createRenderedMenu() {
- RenderedMenuImpl renderedMenu = new RenderedMenuImpl();
- return renderedMenu;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MRenderedToolBar createRenderedToolBar() {
- RenderedToolBarImpl renderedToolBar = new RenderedToolBarImpl();
- return renderedToolBar;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public MToolBarContribution createToolBarContribution() {
ToolBarContributionImpl toolBarContribution = new ToolBarContributionImpl();
return toolBarContribution;
@@ -303,56 +254,6 @@ public class MenuFactoryImpl extends EFactoryImpl implements MMenuFactory {
* <!-- end-user-doc -->
* @generated
*/
- public MRenderedMenuItem createRenderedMenuItem() {
- RenderedMenuItemImpl renderedMenuItem = new RenderedMenuItemImpl();
- return renderedMenuItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MOpaqueToolItem createOpaqueToolItem() {
- OpaqueToolItemImpl opaqueToolItem = new OpaqueToolItemImpl();
- return opaqueToolItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MOpaqueMenuItem createOpaqueMenuItem() {
- OpaqueMenuItemImpl opaqueMenuItem = new OpaqueMenuItemImpl();
- return opaqueMenuItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MOpaqueMenuSeparator createOpaqueMenuSeparator() {
- OpaqueMenuSeparatorImpl opaqueMenuSeparator = new OpaqueMenuSeparatorImpl();
- return opaqueMenuSeparator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MOpaqueMenu createOpaqueMenu() {
- OpaqueMenuImpl opaqueMenu = new OpaqueMenuImpl();
- return opaqueMenu;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public MDynamicMenuContribution createDynamicMenuContribution() {
DynamicMenuContributionImpl dynamicMenuContribution = new DynamicMenuContributionImpl();
return dynamicMenuContribution;
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java
index 999f180..af3fbe1 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java
@@ -30,14 +30,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
@@ -4399,494 +4392,6 @@ public class MenuPackageImpl extends EPackageImpl {
public static final int MENU_CONTRIBUTIONS_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuImpl <em>Rendered Menu</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getRenderedMenu()
- * @generated
- */
- public static final int RENDERED_MENU = 18;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__ELEMENT_ID = MENU__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__PERSISTED_STATE = MENU__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__TAGS = MENU__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__CONTRIBUTOR_URI = MENU__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__TRANSIENT_DATA = MENU__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__WIDGET = MENU__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__RENDERER = MENU__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__TO_BE_RENDERED = MENU__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__ON_TOP = MENU__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__VISIBLE = MENU__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__PARENT = MENU__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__CONTAINER_DATA = MENU__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__CUR_SHARED_REF = MENU__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__VISIBLE_WHEN = MENU__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__ACCESSIBILITY_PHRASE = MENU__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__LOCALIZED_ACCESSIBILITY_PHRASE = MENU__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__LABEL = MENU__LABEL;
-
- /**
- * The feature id for the '<em><b>Icon URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__ICON_URI = MENU__ICON_URI;
-
- /**
- * The feature id for the '<em><b>Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__TOOLTIP = MENU__TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Localized Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__LOCALIZED_LABEL = MENU__LOCALIZED_LABEL;
-
- /**
- * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__LOCALIZED_TOOLTIP = MENU__LOCALIZED_TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__MNEMONICS = MENU__MNEMONICS;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__CHILDREN = MENU__CHILDREN;
-
- /**
- * The feature id for the '<em><b>Selected Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__SELECTED_ELEMENT = MENU__SELECTED_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__ENABLED = MENU__ENABLED;
-
- /**
- * The feature id for the '<em><b>Contribution Manager</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU__CONTRIBUTION_MANAGER = MENU_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Rendered Menu</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 1;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU___UPDATE_LOCALIZATION = MENU___UPDATE_LOCALIZATION;
-
- /**
- * The operation id for the '<em>Get Localized Mnemonics</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU___GET_LOCALIZED_MNEMONICS = MENU___GET_LOCALIZED_MNEMONICS;
-
- /**
- * The number of operations of the '<em>Rendered Menu</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_OPERATION_COUNT = MENU_OPERATION_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedToolBarImpl <em>Rendered Tool Bar</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedToolBarImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getRenderedToolBar()
- * @generated
- */
- public static final int RENDERED_TOOL_BAR = 19;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__ELEMENT_ID = TOOL_BAR__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__PERSISTED_STATE = TOOL_BAR__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__TAGS = TOOL_BAR__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__CONTRIBUTOR_URI = TOOL_BAR__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__TRANSIENT_DATA = TOOL_BAR__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__WIDGET = TOOL_BAR__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__RENDERER = TOOL_BAR__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__TO_BE_RENDERED = TOOL_BAR__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__ON_TOP = TOOL_BAR__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__VISIBLE = TOOL_BAR__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__PARENT = TOOL_BAR__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__CONTAINER_DATA = TOOL_BAR__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__CUR_SHARED_REF = TOOL_BAR__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__VISIBLE_WHEN = TOOL_BAR__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__ACCESSIBILITY_PHRASE = TOOL_BAR__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__LOCALIZED_ACCESSIBILITY_PHRASE = TOOL_BAR__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__CHILDREN = TOOL_BAR__CHILDREN;
-
- /**
- * The feature id for the '<em><b>Selected Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__SELECTED_ELEMENT = TOOL_BAR__SELECTED_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contribution Manager</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER = TOOL_BAR_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Rendered Tool Bar</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR_FEATURE_COUNT = TOOL_BAR_FEATURE_COUNT + 1;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR___UPDATE_LOCALIZATION = TOOL_BAR___UPDATE_LOCALIZATION;
-
- /**
- * The number of operations of the '<em>Rendered Tool Bar</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_TOOL_BAR_OPERATION_COUNT = TOOL_BAR_OPERATION_COUNT + 0;
-
- /**
* The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ToolBarContributionImpl <em>Tool Bar Contribution</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -4894,7 +4399,7 @@ public class MenuPackageImpl extends EPackageImpl {
* @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getToolBarContribution()
* @generated
*/
- public static final int TOOL_BAR_CONTRIBUTION = 20;
+ public static final int TOOL_BAR_CONTRIBUTION = 18;
/**
* The feature id for the '<em><b>Element Id</b></em>' attribute.
@@ -5111,7 +4616,7 @@ public class MenuPackageImpl extends EPackageImpl {
* @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getToolBarContributions()
* @generated
*/
- public static final int TOOL_BAR_CONTRIBUTIONS = 21;
+ public static final int TOOL_BAR_CONTRIBUTIONS = 19;
/**
* The feature id for the '<em><b>Tool Bar Contributions</b></em>' containment reference list.
@@ -5148,7 +4653,7 @@ public class MenuPackageImpl extends EPackageImpl {
* @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getTrimContribution()
* @generated
*/
- public static final int TRIM_CONTRIBUTION = 22;
+ public static final int TRIM_CONTRIBUTION = 20;
/**
* The feature id for the '<em><b>Element Id</b></em>' attribute.
@@ -5365,7 +4870,7 @@ public class MenuPackageImpl extends EPackageImpl {
* @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getTrimContributions()
* @generated
*/
- public static final int TRIM_CONTRIBUTIONS = 23;
+ public static final int TRIM_CONTRIBUTIONS = 21;
/**
* The feature id for the '<em><b>Trim Contributions</b></em>' containment reference list.
@@ -5395,1361 +4900,6 @@ public class MenuPackageImpl extends EPackageImpl {
public static final int TRIM_CONTRIBUTIONS_OPERATION_COUNT = 0;
/**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuItemImpl <em>Rendered Menu Item</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuItemImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getRenderedMenuItem()
- * @generated
- */
- public static final int RENDERED_MENU_ITEM = 24;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__ELEMENT_ID = MENU_ITEM__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__PERSISTED_STATE = MENU_ITEM__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__TAGS = MENU_ITEM__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__CONTRIBUTOR_URI = MENU_ITEM__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__TRANSIENT_DATA = MENU_ITEM__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__WIDGET = MENU_ITEM__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__RENDERER = MENU_ITEM__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__TO_BE_RENDERED = MENU_ITEM__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__ON_TOP = MENU_ITEM__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__VISIBLE = MENU_ITEM__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__PARENT = MENU_ITEM__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__CONTAINER_DATA = MENU_ITEM__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__CUR_SHARED_REF = MENU_ITEM__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__VISIBLE_WHEN = MENU_ITEM__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__ACCESSIBILITY_PHRASE = MENU_ITEM__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__LOCALIZED_ACCESSIBILITY_PHRASE = MENU_ITEM__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__LABEL = MENU_ITEM__LABEL;
-
- /**
- * The feature id for the '<em><b>Icon URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__ICON_URI = MENU_ITEM__ICON_URI;
-
- /**
- * The feature id for the '<em><b>Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__TOOLTIP = MENU_ITEM__TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Localized Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__LOCALIZED_LABEL = MENU_ITEM__LOCALIZED_LABEL;
-
- /**
- * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__LOCALIZED_TOOLTIP = MENU_ITEM__LOCALIZED_TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__ENABLED = MENU_ITEM__ENABLED;
-
- /**
- * The feature id for the '<em><b>Selected</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__SELECTED = MENU_ITEM__SELECTED;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__TYPE = MENU_ITEM__TYPE;
-
- /**
- * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__MNEMONICS = MENU_ITEM__MNEMONICS;
-
- /**
- * The feature id for the '<em><b>Contribution Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM__CONTRIBUTION_ITEM = MENU_ITEM_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Rendered Menu Item</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 1;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM___UPDATE_LOCALIZATION = MENU_ITEM___UPDATE_LOCALIZATION;
-
- /**
- * The operation id for the '<em>Get Localized Mnemonics</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM___GET_LOCALIZED_MNEMONICS = MENU_ITEM___GET_LOCALIZED_MNEMONICS;
-
- /**
- * The number of operations of the '<em>Rendered Menu Item</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int RENDERED_MENU_ITEM_OPERATION_COUNT = MENU_ITEM_OPERATION_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueToolItemImpl <em>Opaque Tool Item</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueToolItemImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueToolItem()
- * @generated
- */
- public static final int OPAQUE_TOOL_ITEM = 25;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__ELEMENT_ID = TOOL_ITEM__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__PERSISTED_STATE = TOOL_ITEM__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__TAGS = TOOL_ITEM__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__CONTRIBUTOR_URI = TOOL_ITEM__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__TRANSIENT_DATA = TOOL_ITEM__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__WIDGET = TOOL_ITEM__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__RENDERER = TOOL_ITEM__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__TO_BE_RENDERED = TOOL_ITEM__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__ON_TOP = TOOL_ITEM__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__VISIBLE = TOOL_ITEM__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__PARENT = TOOL_ITEM__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__CONTAINER_DATA = TOOL_ITEM__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__CUR_SHARED_REF = TOOL_ITEM__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__VISIBLE_WHEN = TOOL_ITEM__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__ACCESSIBILITY_PHRASE = TOOL_ITEM__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__LOCALIZED_ACCESSIBILITY_PHRASE = TOOL_ITEM__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__LABEL = TOOL_ITEM__LABEL;
-
- /**
- * The feature id for the '<em><b>Icon URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__ICON_URI = TOOL_ITEM__ICON_URI;
-
- /**
- * The feature id for the '<em><b>Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__TOOLTIP = TOOL_ITEM__TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Localized Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__LOCALIZED_LABEL = TOOL_ITEM__LOCALIZED_LABEL;
-
- /**
- * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__LOCALIZED_TOOLTIP = TOOL_ITEM__LOCALIZED_TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__ENABLED = TOOL_ITEM__ENABLED;
-
- /**
- * The feature id for the '<em><b>Selected</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__SELECTED = TOOL_ITEM__SELECTED;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__TYPE = TOOL_ITEM__TYPE;
-
- /**
- * The feature id for the '<em><b>Menu</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__MENU = TOOL_ITEM__MENU;
-
- /**
- * The feature id for the '<em><b>Opaque Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM__OPAQUE_ITEM = TOOL_ITEM_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Opaque Tool Item</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM_FEATURE_COUNT = TOOL_ITEM_FEATURE_COUNT + 1;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM___UPDATE_LOCALIZATION = TOOL_ITEM___UPDATE_LOCALIZATION;
-
- /**
- * The number of operations of the '<em>Opaque Tool Item</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_TOOL_ITEM_OPERATION_COUNT = TOOL_ITEM_OPERATION_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuItemImpl <em>Opaque Menu Item</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuItemImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueMenuItem()
- * @generated
- */
- public static final int OPAQUE_MENU_ITEM = 26;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__ELEMENT_ID = MENU_ITEM__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__PERSISTED_STATE = MENU_ITEM__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__TAGS = MENU_ITEM__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__CONTRIBUTOR_URI = MENU_ITEM__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__TRANSIENT_DATA = MENU_ITEM__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__WIDGET = MENU_ITEM__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__RENDERER = MENU_ITEM__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__TO_BE_RENDERED = MENU_ITEM__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__ON_TOP = MENU_ITEM__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__VISIBLE = MENU_ITEM__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__PARENT = MENU_ITEM__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__CONTAINER_DATA = MENU_ITEM__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__CUR_SHARED_REF = MENU_ITEM__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__VISIBLE_WHEN = MENU_ITEM__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__ACCESSIBILITY_PHRASE = MENU_ITEM__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__LOCALIZED_ACCESSIBILITY_PHRASE = MENU_ITEM__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__LABEL = MENU_ITEM__LABEL;
-
- /**
- * The feature id for the '<em><b>Icon URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__ICON_URI = MENU_ITEM__ICON_URI;
-
- /**
- * The feature id for the '<em><b>Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__TOOLTIP = MENU_ITEM__TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Localized Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__LOCALIZED_LABEL = MENU_ITEM__LOCALIZED_LABEL;
-
- /**
- * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__LOCALIZED_TOOLTIP = MENU_ITEM__LOCALIZED_TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__ENABLED = MENU_ITEM__ENABLED;
-
- /**
- * The feature id for the '<em><b>Selected</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__SELECTED = MENU_ITEM__SELECTED;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__TYPE = MENU_ITEM__TYPE;
-
- /**
- * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__MNEMONICS = MENU_ITEM__MNEMONICS;
-
- /**
- * The feature id for the '<em><b>Opaque Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM__OPAQUE_ITEM = MENU_ITEM_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Opaque Menu Item</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM_FEATURE_COUNT = MENU_ITEM_FEATURE_COUNT + 1;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM___UPDATE_LOCALIZATION = MENU_ITEM___UPDATE_LOCALIZATION;
-
- /**
- * The operation id for the '<em>Get Localized Mnemonics</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM___GET_LOCALIZED_MNEMONICS = MENU_ITEM___GET_LOCALIZED_MNEMONICS;
-
- /**
- * The number of operations of the '<em>Opaque Menu Item</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_ITEM_OPERATION_COUNT = MENU_ITEM_OPERATION_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuSeparatorImpl <em>Opaque Menu Separator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuSeparatorImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueMenuSeparator()
- * @generated
- */
- public static final int OPAQUE_MENU_SEPARATOR = 27;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__ELEMENT_ID = MENU_SEPARATOR__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__PERSISTED_STATE = MENU_SEPARATOR__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__TAGS = MENU_SEPARATOR__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__CONTRIBUTOR_URI = MENU_SEPARATOR__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__TRANSIENT_DATA = MENU_SEPARATOR__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__WIDGET = MENU_SEPARATOR__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__RENDERER = MENU_SEPARATOR__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__TO_BE_RENDERED = MENU_SEPARATOR__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__ON_TOP = MENU_SEPARATOR__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__VISIBLE = MENU_SEPARATOR__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__PARENT = MENU_SEPARATOR__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__CONTAINER_DATA = MENU_SEPARATOR__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__CUR_SHARED_REF = MENU_SEPARATOR__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__VISIBLE_WHEN = MENU_SEPARATOR__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__ACCESSIBILITY_PHRASE = MENU_SEPARATOR__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__LOCALIZED_ACCESSIBILITY_PHRASE = MENU_SEPARATOR__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__LABEL = MENU_SEPARATOR__LABEL;
-
- /**
- * The feature id for the '<em><b>Icon URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__ICON_URI = MENU_SEPARATOR__ICON_URI;
-
- /**
- * The feature id for the '<em><b>Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__TOOLTIP = MENU_SEPARATOR__TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Localized Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__LOCALIZED_LABEL = MENU_SEPARATOR__LOCALIZED_LABEL;
-
- /**
- * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__LOCALIZED_TOOLTIP = MENU_SEPARATOR__LOCALIZED_TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__MNEMONICS = MENU_SEPARATOR__MNEMONICS;
-
- /**
- * The feature id for the '<em><b>Opaque Item</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM = MENU_SEPARATOR_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Opaque Menu Separator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR_FEATURE_COUNT = MENU_SEPARATOR_FEATURE_COUNT + 1;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR___UPDATE_LOCALIZATION = MENU_SEPARATOR___UPDATE_LOCALIZATION;
-
- /**
- * The operation id for the '<em>Get Localized Mnemonics</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR___GET_LOCALIZED_MNEMONICS = MENU_SEPARATOR___GET_LOCALIZED_MNEMONICS;
-
- /**
- * The number of operations of the '<em>Opaque Menu Separator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_SEPARATOR_OPERATION_COUNT = MENU_SEPARATOR_OPERATION_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuImpl <em>Opaque Menu</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueMenu()
- * @generated
- */
- public static final int OPAQUE_MENU = 28;
-
- /**
- * The feature id for the '<em><b>Element Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__ELEMENT_ID = MENU__ELEMENT_ID;
-
- /**
- * The feature id for the '<em><b>Persisted State</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__PERSISTED_STATE = MENU__PERSISTED_STATE;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__TAGS = MENU__TAGS;
-
- /**
- * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__CONTRIBUTOR_URI = MENU__CONTRIBUTOR_URI;
-
- /**
- * The feature id for the '<em><b>Transient Data</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__TRANSIENT_DATA = MENU__TRANSIENT_DATA;
-
- /**
- * The feature id for the '<em><b>Widget</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__WIDGET = MENU__WIDGET;
-
- /**
- * The feature id for the '<em><b>Renderer</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__RENDERER = MENU__RENDERER;
-
- /**
- * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__TO_BE_RENDERED = MENU__TO_BE_RENDERED;
-
- /**
- * The feature id for the '<em><b>On Top</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__ON_TOP = MENU__ON_TOP;
-
- /**
- * The feature id for the '<em><b>Visible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__VISIBLE = MENU__VISIBLE;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__PARENT = MENU__PARENT;
-
- /**
- * The feature id for the '<em><b>Container Data</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__CONTAINER_DATA = MENU__CONTAINER_DATA;
-
- /**
- * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__CUR_SHARED_REF = MENU__CUR_SHARED_REF;
-
- /**
- * The feature id for the '<em><b>Visible When</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__VISIBLE_WHEN = MENU__VISIBLE_WHEN;
-
- /**
- * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__ACCESSIBILITY_PHRASE = MENU__ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__LOCALIZED_ACCESSIBILITY_PHRASE = MENU__LOCALIZED_ACCESSIBILITY_PHRASE;
-
- /**
- * The feature id for the '<em><b>Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__LABEL = MENU__LABEL;
-
- /**
- * The feature id for the '<em><b>Icon URI</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__ICON_URI = MENU__ICON_URI;
-
- /**
- * The feature id for the '<em><b>Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__TOOLTIP = MENU__TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Localized Label</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__LOCALIZED_LABEL = MENU__LOCALIZED_LABEL;
-
- /**
- * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__LOCALIZED_TOOLTIP = MENU__LOCALIZED_TOOLTIP;
-
- /**
- * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__MNEMONICS = MENU__MNEMONICS;
-
- /**
- * The feature id for the '<em><b>Children</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__CHILDREN = MENU__CHILDREN;
-
- /**
- * The feature id for the '<em><b>Selected Element</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__SELECTED_ELEMENT = MENU__SELECTED_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Enabled</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU__ENABLED = MENU__ENABLED;
-
- /**
- * The number of structural features of the '<em>Opaque Menu</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 0;
-
- /**
- * The operation id for the '<em>Update Localization</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU___UPDATE_LOCALIZATION = MENU___UPDATE_LOCALIZATION;
-
- /**
- * The operation id for the '<em>Get Localized Mnemonics</em>' operation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU___GET_LOCALIZED_MNEMONICS = MENU___GET_LOCALIZED_MNEMONICS;
-
- /**
- * The number of operations of the '<em>Opaque Menu</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- public static final int OPAQUE_MENU_OPERATION_COUNT = MENU_OPERATION_COUNT + 0;
-
- /**
* The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.DynamicMenuContributionImpl <em>Dynamic Menu Contribution</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -6757,7 +4907,7 @@ public class MenuPackageImpl extends EPackageImpl {
* @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getDynamicMenuContribution()
* @generated
*/
- public static final int DYNAMIC_MENU_CONTRIBUTION = 29;
+ public static final int DYNAMIC_MENU_CONTRIBUTION = 22;
/**
* The feature id for the '<em><b>Element Id</b></em>' attribute.
@@ -7046,7 +5196,7 @@ public class MenuPackageImpl extends EPackageImpl {
* @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getItemType()
* @generated
*/
- public static final int ITEM_TYPE = 30;
+ public static final int ITEM_TYPE = 23;
/**
* <!-- begin-user-doc -->
@@ -7179,20 +5329,6 @@ public class MenuPackageImpl extends EPackageImpl {
* <!-- end-user-doc -->
* @generated
*/
- private EClass renderedMenuEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass renderedToolBarEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EClass toolBarContributionEClass = null;
/**
@@ -7221,41 +5357,6 @@ public class MenuPackageImpl extends EPackageImpl {
* <!-- end-user-doc -->
* @generated
*/
- private EClass renderedMenuItemEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass opaqueToolItemEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass opaqueMenuItemEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass opaqueMenuSeparatorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass opaqueMenuEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EClass dynamicMenuContributionEClass = null;
/**
@@ -7741,60 +5842,6 @@ public class MenuPackageImpl extends EPackageImpl {
/**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu <em>Rendered Menu</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Rendered Menu</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu
- * @generated
- */
- public EClass getRenderedMenu() {
- return renderedMenuEClass;
- }
-
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu#getContributionManager <em>Contribution Manager</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Contribution Manager</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu#getContributionManager()
- * @see #getRenderedMenu()
- * @generated
- */
- public EAttribute getRenderedMenu_ContributionManager() {
- return (EAttribute)renderedMenuEClass.getEStructuralFeatures().get(0);
- }
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar <em>Rendered Tool Bar</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Rendered Tool Bar</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar
- * @generated
- */
- public EClass getRenderedToolBar() {
- return renderedToolBarEClass;
- }
-
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar#getContributionManager <em>Contribution Manager</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Contribution Manager</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar#getContributionManager()
- * @see #getRenderedToolBar()
- * @generated
- */
- public EAttribute getRenderedToolBar_ContributionManager() {
- return (EAttribute)renderedToolBarEClass.getEStructuralFeatures().get(0);
- }
-
-
- /**
* Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution <em>Tool Bar Contribution</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -7931,127 +5978,6 @@ public class MenuPackageImpl extends EPackageImpl {
/**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem <em>Rendered Menu Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Rendered Menu Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem
- * @generated
- */
- public EClass getRenderedMenuItem() {
- return renderedMenuItemEClass;
- }
-
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem#getContributionItem <em>Contribution Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Contribution Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem#getContributionItem()
- * @see #getRenderedMenuItem()
- * @generated
- */
- public EAttribute getRenderedMenuItem_ContributionItem() {
- return (EAttribute)renderedMenuItemEClass.getEStructuralFeatures().get(0);
- }
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem <em>Opaque Tool Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Opaque Tool Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem
- * @generated
- */
- public EClass getOpaqueToolItem() {
- return opaqueToolItemEClass;
- }
-
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem#getOpaqueItem <em>Opaque Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Opaque Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem#getOpaqueItem()
- * @see #getOpaqueToolItem()
- * @generated
- */
- public EAttribute getOpaqueToolItem_OpaqueItem() {
- return (EAttribute)opaqueToolItemEClass.getEStructuralFeatures().get(0);
- }
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem <em>Opaque Menu Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Opaque Menu Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem
- * @generated
- */
- public EClass getOpaqueMenuItem() {
- return opaqueMenuItemEClass;
- }
-
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem#getOpaqueItem <em>Opaque Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Opaque Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem#getOpaqueItem()
- * @see #getOpaqueMenuItem()
- * @generated
- */
- public EAttribute getOpaqueMenuItem_OpaqueItem() {
- return (EAttribute)opaqueMenuItemEClass.getEStructuralFeatures().get(0);
- }
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator <em>Opaque Menu Separator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Opaque Menu Separator</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator
- * @generated
- */
- public EClass getOpaqueMenuSeparator() {
- return opaqueMenuSeparatorEClass;
- }
-
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator#getOpaqueItem <em>Opaque Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Opaque Item</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator#getOpaqueItem()
- * @see #getOpaqueMenuSeparator()
- * @generated
- */
- public EAttribute getOpaqueMenuSeparator_OpaqueItem() {
- return (EAttribute)opaqueMenuSeparatorEClass.getEStructuralFeatures().get(0);
- }
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu <em>Opaque Menu</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Opaque Menu</em>'.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu
- * @generated
- */
- public EClass getOpaqueMenu() {
- return opaqueMenuEClass;
- }
-
-
- /**
* Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.menu.MDynamicMenuContribution <em>Dynamic Menu Contribution</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -8155,12 +6081,6 @@ public class MenuPackageImpl extends EPackageImpl {
menuContributionsEClass = createEClass(MENU_CONTRIBUTIONS);
createEReference(menuContributionsEClass, MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS);
- renderedMenuEClass = createEClass(RENDERED_MENU);
- createEAttribute(renderedMenuEClass, RENDERED_MENU__CONTRIBUTION_MANAGER);
-
- renderedToolBarEClass = createEClass(RENDERED_TOOL_BAR);
- createEAttribute(renderedToolBarEClass, RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER);
-
toolBarContributionEClass = createEClass(TOOL_BAR_CONTRIBUTION);
createEAttribute(toolBarContributionEClass, TOOL_BAR_CONTRIBUTION__PARENT_ID);
createEAttribute(toolBarContributionEClass, TOOL_BAR_CONTRIBUTION__POSITION_IN_PARENT);
@@ -8175,20 +6095,6 @@ public class MenuPackageImpl extends EPackageImpl {
trimContributionsEClass = createEClass(TRIM_CONTRIBUTIONS);
createEReference(trimContributionsEClass, TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS);
- renderedMenuItemEClass = createEClass(RENDERED_MENU_ITEM);
- createEAttribute(renderedMenuItemEClass, RENDERED_MENU_ITEM__CONTRIBUTION_ITEM);
-
- opaqueToolItemEClass = createEClass(OPAQUE_TOOL_ITEM);
- createEAttribute(opaqueToolItemEClass, OPAQUE_TOOL_ITEM__OPAQUE_ITEM);
-
- opaqueMenuItemEClass = createEClass(OPAQUE_MENU_ITEM);
- createEAttribute(opaqueMenuItemEClass, OPAQUE_MENU_ITEM__OPAQUE_ITEM);
-
- opaqueMenuSeparatorEClass = createEClass(OPAQUE_MENU_SEPARATOR);
- createEAttribute(opaqueMenuSeparatorEClass, OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM);
-
- opaqueMenuEClass = createEClass(OPAQUE_MENU);
-
dynamicMenuContributionEClass = createEClass(DYNAMIC_MENU_CONTRIBUTION);
// Create enums
@@ -8270,8 +6176,6 @@ public class MenuPackageImpl extends EPackageImpl {
directToolItemEClass.getESuperTypes().add(this.getToolItem());
directToolItemEClass.getESuperTypes().add(theApplicationPackage.getContribution());
toolBarSeparatorEClass.getESuperTypes().add(this.getToolBarElement());
- renderedMenuEClass.getESuperTypes().add(this.getMenu());
- renderedToolBarEClass.getESuperTypes().add(this.getToolBar());
g1 = createEGenericType(theUiPackage.getElementContainer());
g2 = createEGenericType(this.getToolBarElement());
g1.getETypeArguments().add(g2);
@@ -8280,11 +6184,6 @@ public class MenuPackageImpl extends EPackageImpl {
g2 = createEGenericType(theBasicPackage.getTrimElement());
g1.getETypeArguments().add(g2);
trimContributionEClass.getEGenericSuperTypes().add(g1);
- renderedMenuItemEClass.getESuperTypes().add(this.getMenuItem());
- opaqueToolItemEClass.getESuperTypes().add(this.getToolItem());
- opaqueMenuItemEClass.getESuperTypes().add(this.getMenuItem());
- opaqueMenuSeparatorEClass.getESuperTypes().add(this.getMenuSeparator());
- opaqueMenuEClass.getESuperTypes().add(this.getMenu());
dynamicMenuContributionEClass.getESuperTypes().add(this.getMenuItem());
dynamicMenuContributionEClass.getESuperTypes().add(theApplicationPackage.getContribution());
@@ -8339,12 +6238,6 @@ public class MenuPackageImpl extends EPackageImpl {
initEClass(menuContributionsEClass, MMenuContributions.class, "MenuContributions", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getMenuContributions_MenuContributions(), this.getMenuContribution(), null, "menuContributions", null, 0, -1, MMenuContributions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEClass(renderedMenuEClass, MRenderedMenu.class, "RenderedMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getRenderedMenu_ContributionManager(), ecorePackage.getEJavaObject(), "contributionManager", null, 0, 1, MRenderedMenu.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(renderedToolBarEClass, MRenderedToolBar.class, "RenderedToolBar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getRenderedToolBar_ContributionManager(), ecorePackage.getEJavaObject(), "contributionManager", null, 0, 1, MRenderedToolBar.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
initEClass(toolBarContributionEClass, MToolBarContribution.class, "ToolBarContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getToolBarContribution_ParentId(), ecorePackage.getEString(), "parentId", null, 0, 1, MToolBarContribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getToolBarContribution_PositionInParent(), ecorePackage.getEString(), "positionInParent", null, 0, 1, MToolBarContribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -8359,20 +6252,6 @@ public class MenuPackageImpl extends EPackageImpl {
initEClass(trimContributionsEClass, MTrimContributions.class, "TrimContributions", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getTrimContributions_TrimContributions(), this.getTrimContribution(), null, "trimContributions", null, 0, -1, MTrimContributions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEClass(renderedMenuItemEClass, MRenderedMenuItem.class, "RenderedMenuItem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getRenderedMenuItem_ContributionItem(), ecorePackage.getEJavaObject(), "contributionItem", null, 0, 1, MRenderedMenuItem.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(opaqueToolItemEClass, MOpaqueToolItem.class, "OpaqueToolItem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getOpaqueToolItem_OpaqueItem(), ecorePackage.getEJavaObject(), "opaqueItem", null, 0, 1, MOpaqueToolItem.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(opaqueMenuItemEClass, MOpaqueMenuItem.class, "OpaqueMenuItem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getOpaqueMenuItem_OpaqueItem(), ecorePackage.getEJavaObject(), "opaqueItem", null, 0, 1, MOpaqueMenuItem.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(opaqueMenuSeparatorEClass, MOpaqueMenuSeparator.class, "OpaqueMenuSeparator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getOpaqueMenuSeparator_OpaqueItem(), ecorePackage.getEJavaObject(), "opaqueItem", null, 0, 1, MOpaqueMenuSeparator.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(opaqueMenuEClass, MOpaqueMenu.class, "OpaqueMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
initEClass(dynamicMenuContributionEClass, MDynamicMenuContribution.class, "DynamicMenuContribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
// Initialize enums and add enum literals
@@ -8680,42 +6559,6 @@ public class MenuPackageImpl extends EPackageImpl {
public static final EReference MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS = eINSTANCE.getMenuContributions_MenuContributions();
/**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuImpl <em>Rendered Menu</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getRenderedMenu()
- * @generated
- */
- public static final EClass RENDERED_MENU = eINSTANCE.getRenderedMenu();
-
- /**
- * The meta object literal for the '<em><b>Contribution Manager</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RENDERED_MENU__CONTRIBUTION_MANAGER = eINSTANCE.getRenderedMenu_ContributionManager();
-
- /**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedToolBarImpl <em>Rendered Tool Bar</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedToolBarImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getRenderedToolBar()
- * @generated
- */
- public static final EClass RENDERED_TOOL_BAR = eINSTANCE.getRenderedToolBar();
-
- /**
- * The meta object literal for the '<em><b>Contribution Manager</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER = eINSTANCE.getRenderedToolBar_ContributionManager();
-
- /**
* The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ToolBarContributionImpl <em>Tool Bar Contribution</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -8804,88 +6647,6 @@ public class MenuPackageImpl extends EPackageImpl {
public static final EReference TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS = eINSTANCE.getTrimContributions_TrimContributions();
/**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuItemImpl <em>Rendered Menu Item</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuItemImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getRenderedMenuItem()
- * @generated
- */
- public static final EClass RENDERED_MENU_ITEM = eINSTANCE.getRenderedMenuItem();
-
- /**
- * The meta object literal for the '<em><b>Contribution Item</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute RENDERED_MENU_ITEM__CONTRIBUTION_ITEM = eINSTANCE.getRenderedMenuItem_ContributionItem();
-
- /**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueToolItemImpl <em>Opaque Tool Item</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueToolItemImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueToolItem()
- * @generated
- */
- public static final EClass OPAQUE_TOOL_ITEM = eINSTANCE.getOpaqueToolItem();
-
- /**
- * The meta object literal for the '<em><b>Opaque Item</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute OPAQUE_TOOL_ITEM__OPAQUE_ITEM = eINSTANCE.getOpaqueToolItem_OpaqueItem();
-
- /**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuItemImpl <em>Opaque Menu Item</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuItemImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueMenuItem()
- * @generated
- */
- public static final EClass OPAQUE_MENU_ITEM = eINSTANCE.getOpaqueMenuItem();
-
- /**
- * The meta object literal for the '<em><b>Opaque Item</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute OPAQUE_MENU_ITEM__OPAQUE_ITEM = eINSTANCE.getOpaqueMenuItem_OpaqueItem();
-
- /**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuSeparatorImpl <em>Opaque Menu Separator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuSeparatorImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueMenuSeparator()
- * @generated
- */
- public static final EClass OPAQUE_MENU_SEPARATOR = eINSTANCE.getOpaqueMenuSeparator();
-
- /**
- * The meta object literal for the '<em><b>Opaque Item</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final EAttribute OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM = eINSTANCE.getOpaqueMenuSeparator_OpaqueItem();
-
- /**
- * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuImpl <em>Opaque Menu</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuImpl
- * @see org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl#getOpaqueMenu()
- * @generated
- */
- public static final EClass OPAQUE_MENU = eINSTANCE.getOpaqueMenu();
-
- /**
* The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.DynamicMenuContributionImpl <em>Dynamic Menu Contribution</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuImpl.java
deleted file mode 100644
index 7300f77..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Opaque Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class OpaqueMenuImpl extends MenuImpl implements MOpaqueMenu {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected OpaqueMenuImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.OPAQUE_MENU;
- }
-
-} //OpaqueMenuImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuItemImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuItemImpl.java
deleted file mode 100644
index 8793a17..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuItemImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Opaque Menu Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuItemImpl#getOpaqueItem <em>Opaque Item</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OpaqueMenuItemImpl extends MenuItemImpl implements MOpaqueMenuItem {
- /**
- * The default value of the '{@link #getOpaqueItem() <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOpaqueItem()
- * @generated
- * @ordered
- */
- protected static final Object OPAQUE_ITEM_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getOpaqueItem() <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOpaqueItem()
- * @generated
- * @ordered
- */
- protected Object opaqueItem = OPAQUE_ITEM_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected OpaqueMenuItemImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.OPAQUE_MENU_ITEM;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getOpaqueItem() {
- return opaqueItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOpaqueItem(Object newOpaqueItem) {
- Object oldOpaqueItem = opaqueItem;
- opaqueItem = newOpaqueItem;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.OPAQUE_MENU_ITEM__OPAQUE_ITEM, oldOpaqueItem, opaqueItem));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_ITEM__OPAQUE_ITEM:
- return getOpaqueItem();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_ITEM__OPAQUE_ITEM:
- setOpaqueItem(newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_ITEM__OPAQUE_ITEM:
- setOpaqueItem(OPAQUE_ITEM_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_ITEM__OPAQUE_ITEM:
- return OPAQUE_ITEM_EDEFAULT == null ? opaqueItem != null : !OPAQUE_ITEM_EDEFAULT.equals(opaqueItem);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (opaqueItem: "); //$NON-NLS-1$
- result.append(opaqueItem);
- result.append(')');
- return result.toString();
- }
-
-} //OpaqueMenuItemImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuSeparatorImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuSeparatorImpl.java
deleted file mode 100644
index 3014f65..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueMenuSeparatorImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Opaque Menu Separator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueMenuSeparatorImpl#getOpaqueItem <em>Opaque Item</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OpaqueMenuSeparatorImpl extends MenuSeparatorImpl implements MOpaqueMenuSeparator {
- /**
- * The default value of the '{@link #getOpaqueItem() <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOpaqueItem()
- * @generated
- * @ordered
- */
- protected static final Object OPAQUE_ITEM_EDEFAULT = null;
- /**
- * The cached value of the '{@link #getOpaqueItem() <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOpaqueItem()
- * @generated
- * @ordered
- */
- protected Object opaqueItem = OPAQUE_ITEM_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected OpaqueMenuSeparatorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.OPAQUE_MENU_SEPARATOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getOpaqueItem() {
- return opaqueItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOpaqueItem(Object newOpaqueItem) {
- Object oldOpaqueItem = opaqueItem;
- opaqueItem = newOpaqueItem;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM, oldOpaqueItem, opaqueItem));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM:
- return getOpaqueItem();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM:
- setOpaqueItem(newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM:
- setOpaqueItem(OPAQUE_ITEM_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_MENU_SEPARATOR__OPAQUE_ITEM:
- return OPAQUE_ITEM_EDEFAULT == null ? opaqueItem != null : !OPAQUE_ITEM_EDEFAULT.equals(opaqueItem);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (opaqueItem: "); //$NON-NLS-1$
- result.append(opaqueItem);
- result.append(')');
- return result.toString();
- }
-
-} //OpaqueMenuSeparatorImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueToolItemImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueToolItemImpl.java
deleted file mode 100644
index d8d13bc..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/OpaqueToolItemImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2008, 2011 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Opaque Tool Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.OpaqueToolItemImpl#getOpaqueItem <em>Opaque Item</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OpaqueToolItemImpl extends ToolItemImpl implements MOpaqueToolItem {
- /**
- * The default value of the '{@link #getOpaqueItem() <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOpaqueItem()
- * @generated
- * @ordered
- */
- protected static final Object OPAQUE_ITEM_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getOpaqueItem() <em>Opaque Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOpaqueItem()
- * @generated
- * @ordered
- */
- protected Object opaqueItem = OPAQUE_ITEM_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected OpaqueToolItemImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.OPAQUE_TOOL_ITEM;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getOpaqueItem() {
- return opaqueItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOpaqueItem(Object newOpaqueItem) {
- Object oldOpaqueItem = opaqueItem;
- opaqueItem = newOpaqueItem;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.OPAQUE_TOOL_ITEM__OPAQUE_ITEM, oldOpaqueItem, opaqueItem));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_TOOL_ITEM__OPAQUE_ITEM:
- return getOpaqueItem();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_TOOL_ITEM__OPAQUE_ITEM:
- setOpaqueItem(newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_TOOL_ITEM__OPAQUE_ITEM:
- setOpaqueItem(OPAQUE_ITEM_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.OPAQUE_TOOL_ITEM__OPAQUE_ITEM:
- return OPAQUE_ITEM_EDEFAULT == null ? opaqueItem != null : !OPAQUE_ITEM_EDEFAULT.equals(opaqueItem);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (opaqueItem: "); //$NON-NLS-1$
- result.append(opaqueItem);
- result.append(')');
- return result.toString();
- }
-
-} //OpaqueToolItemImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuImpl.java
deleted file mode 100644
index b674f5d..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rendered Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuImpl#getContributionManager <em>Contribution Manager</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RenderedMenuImpl extends MenuImpl implements MRenderedMenu {
- /**
- * The default value of the '{@link #getContributionManager() <em>Contribution Manager</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContributionManager()
- * @generated
- * @ordered
- */
- protected static final Object CONTRIBUTION_MANAGER_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getContributionManager() <em>Contribution Manager</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContributionManager()
- * @generated
- * @ordered
- */
- protected Object contributionManager = CONTRIBUTION_MANAGER_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected RenderedMenuImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.RENDERED_MENU;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getContributionManager() {
- return contributionManager;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setContributionManager(Object newContributionManager) {
- Object oldContributionManager = contributionManager;
- contributionManager = newContributionManager;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.RENDERED_MENU__CONTRIBUTION_MANAGER, oldContributionManager, contributionManager));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU__CONTRIBUTION_MANAGER:
- return getContributionManager();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU__CONTRIBUTION_MANAGER:
- setContributionManager(newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU__CONTRIBUTION_MANAGER:
- setContributionManager(CONTRIBUTION_MANAGER_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU__CONTRIBUTION_MANAGER:
- return CONTRIBUTION_MANAGER_EDEFAULT == null ? contributionManager != null : !CONTRIBUTION_MANAGER_EDEFAULT.equals(contributionManager);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (contributionManager: "); //$NON-NLS-1$
- result.append(contributionManager);
- result.append(')');
- return result.toString();
- }
-
-} //RenderedMenuImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuItemImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuItemImpl.java
deleted file mode 100644
index 2821973..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedMenuItemImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rendered Menu Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedMenuItemImpl#getContributionItem <em>Contribution Item</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RenderedMenuItemImpl extends MenuItemImpl implements MRenderedMenuItem {
- /**
- * The default value of the '{@link #getContributionItem() <em>Contribution Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContributionItem()
- * @generated
- * @ordered
- */
- protected static final Object CONTRIBUTION_ITEM_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getContributionItem() <em>Contribution Item</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContributionItem()
- * @generated
- * @ordered
- */
- protected Object contributionItem = CONTRIBUTION_ITEM_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected RenderedMenuItemImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.RENDERED_MENU_ITEM;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getContributionItem() {
- return contributionItem;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setContributionItem(Object newContributionItem) {
- Object oldContributionItem = contributionItem;
- contributionItem = newContributionItem;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.RENDERED_MENU_ITEM__CONTRIBUTION_ITEM, oldContributionItem, contributionItem));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU_ITEM__CONTRIBUTION_ITEM:
- return getContributionItem();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU_ITEM__CONTRIBUTION_ITEM:
- setContributionItem(newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU_ITEM__CONTRIBUTION_ITEM:
- setContributionItem(CONTRIBUTION_ITEM_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_MENU_ITEM__CONTRIBUTION_ITEM:
- return CONTRIBUTION_ITEM_EDEFAULT == null ? contributionItem != null : !CONTRIBUTION_ITEM_EDEFAULT.equals(contributionItem);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (contributionItem: "); //$NON-NLS-1$
- result.append(contributionItem);
- result.append(')');
- return result.toString();
- }
-
-} //RenderedMenuItemImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedToolBarImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedToolBarImpl.java
deleted file mode 100644
index 066e5b8..0000000
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/RenderedToolBarImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Copyright (c) 2008, 2010 IBM Corporation and others.
- * 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
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- */
-package org.eclipse.e4.ui.model.application.ui.menu.impl;
-
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rendered Tool Bar</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.RenderedToolBarImpl#getContributionManager <em>Contribution Manager</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RenderedToolBarImpl extends ToolBarImpl implements MRenderedToolBar {
- /**
- * The default value of the '{@link #getContributionManager() <em>Contribution Manager</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContributionManager()
- * @generated
- * @ordered
- */
- protected static final Object CONTRIBUTION_MANAGER_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getContributionManager() <em>Contribution Manager</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContributionManager()
- * @generated
- * @ordered
- */
- protected Object contributionManager = CONTRIBUTION_MANAGER_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected RenderedToolBarImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return MenuPackageImpl.Literals.RENDERED_TOOL_BAR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getContributionManager() {
- return contributionManager;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setContributionManager(Object newContributionManager) {
- Object oldContributionManager = contributionManager;
- contributionManager = newContributionManager;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER, oldContributionManager, contributionManager));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER:
- return getContributionManager();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER:
- setContributionManager(newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER:
- setContributionManager(CONTRIBUTION_MANAGER_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MenuPackageImpl.RENDERED_TOOL_BAR__CONTRIBUTION_MANAGER:
- return CONTRIBUTION_MANAGER_EDEFAULT == null ? contributionManager != null : !CONTRIBUTION_MANAGER_EDEFAULT.equals(contributionManager);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (contributionManager: "); //$NON-NLS-1$
- result.append(contributionManager);
- result.append(')');
- return result.toString();
- }
-
-} //RenderedToolBarImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.java
index 47a61c6..6d337eb 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuAdapterFactory.java
@@ -19,35 +19,6 @@ import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
import org.eclipse.e4.ui.model.application.ui.menu.*;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -183,14 +154,6 @@ public class MenuAdapterFactory extends AdapterFactoryImpl {
return createMenuContributionsAdapter();
}
@Override
- public Adapter caseRenderedMenu(MRenderedMenu object) {
- return createRenderedMenuAdapter();
- }
- @Override
- public Adapter caseRenderedToolBar(MRenderedToolBar object) {
- return createRenderedToolBarAdapter();
- }
- @Override
public Adapter caseToolBarContribution(MToolBarContribution object) {
return createToolBarContributionAdapter();
}
@@ -207,26 +170,6 @@ public class MenuAdapterFactory extends AdapterFactoryImpl {
return createTrimContributionsAdapter();
}
@Override
- public Adapter caseRenderedMenuItem(MRenderedMenuItem object) {
- return createRenderedMenuItemAdapter();
- }
- @Override
- public Adapter caseOpaqueToolItem(MOpaqueToolItem object) {
- return createOpaqueToolItemAdapter();
- }
- @Override
- public Adapter caseOpaqueMenuItem(MOpaqueMenuItem object) {
- return createOpaqueMenuItemAdapter();
- }
- @Override
- public Adapter caseOpaqueMenuSeparator(MOpaqueMenuSeparator object) {
- return createOpaqueMenuSeparatorAdapter();
- }
- @Override
- public Adapter caseOpaqueMenu(MOpaqueMenu object) {
- return createOpaqueMenuAdapter();
- }
- @Override
public Adapter caseDynamicMenuContribution(MDynamicMenuContribution object) {
return createDynamicMenuContributionAdapter();
}
@@ -535,34 +478,6 @@ public class MenuAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu <em>Rendered Menu</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu
- * @generated
- */
- public Adapter createRenderedMenuAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar <em>Rendered Tool Bar</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar
- * @generated
- */
- public Adapter createRenderedToolBarAdapter() {
- return null;
- }
-
- /**
* Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution <em>Tool Bar Contribution</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
@@ -619,76 +534,6 @@ public class MenuAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem <em>Rendered Menu Item</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem
- * @generated
- */
- public Adapter createRenderedMenuItemAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem <em>Opaque Tool Item</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem
- * @generated
- */
- public Adapter createOpaqueToolItemAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem <em>Opaque Menu Item</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem
- * @generated
- */
- public Adapter createOpaqueMenuItemAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator <em>Opaque Menu Separator</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator
- * @generated
- */
- public Adapter createOpaqueMenuSeparatorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu <em>Opaque Menu</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu
- * @generated
- */
- public Adapter createOpaqueMenuAdapter() {
- return null;
- }
-
- /**
* Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.menu.MDynamicMenuContribution <em>Dynamic Menu Contribution</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.java
index e734848..fb5d37f 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/util/MenuSwitch.java
@@ -19,35 +19,6 @@ import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
import org.eclipse.e4.ui.model.application.ui.menu.*;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
@@ -316,31 +287,6 @@ public class MenuSwitch<T1> extends Switch<T1> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case MenuPackageImpl.RENDERED_MENU: {
- MRenderedMenu renderedMenu = (MRenderedMenu)theEObject;
- T1 result = caseRenderedMenu(renderedMenu);
- if (result == null) result = caseMenu(renderedMenu);
- if (result == null) result = caseMenuElement(renderedMenu);
- if (result == null) result = caseElementContainer(renderedMenu);
- if (result == null) result = caseUIElement(renderedMenu);
- if (result == null) result = caseUILabel(renderedMenu);
- if (result == null) result = caseApplicationElement(renderedMenu);
- if (result == null) result = caseLocalizable(renderedMenu);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MenuPackageImpl.RENDERED_TOOL_BAR: {
- MRenderedToolBar renderedToolBar = (MRenderedToolBar)theEObject;
- T1 result = caseRenderedToolBar(renderedToolBar);
- if (result == null) result = caseToolBar(renderedToolBar);
- if (result == null) result = caseElementContainer(renderedToolBar);
- if (result == null) result = caseTrimElement(renderedToolBar);
- if (result == null) result = caseUIElement(renderedToolBar);
- if (result == null) result = caseApplicationElement(renderedToolBar);
- if (result == null) result = caseLocalizable(renderedToolBar);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
case MenuPackageImpl.TOOL_BAR_CONTRIBUTION: {
MToolBarContribution toolBarContribution = (MToolBarContribution)theEObject;
T1 result = caseToolBarContribution(toolBarContribution);
@@ -373,70 +319,6 @@ public class MenuSwitch<T1> extends Switch<T1> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case MenuPackageImpl.RENDERED_MENU_ITEM: {
- MRenderedMenuItem renderedMenuItem = (MRenderedMenuItem)theEObject;
- T1 result = caseRenderedMenuItem(renderedMenuItem);
- if (result == null) result = caseMenuItem(renderedMenuItem);
- if (result == null) result = caseItem(renderedMenuItem);
- if (result == null) result = caseMenuElement(renderedMenuItem);
- if (result == null) result = caseUIElement(renderedMenuItem);
- if (result == null) result = caseUILabel(renderedMenuItem);
- if (result == null) result = caseApplicationElement(renderedMenuItem);
- if (result == null) result = caseLocalizable(renderedMenuItem);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MenuPackageImpl.OPAQUE_TOOL_ITEM: {
- MOpaqueToolItem opaqueToolItem = (MOpaqueToolItem)theEObject;
- T1 result = caseOpaqueToolItem(opaqueToolItem);
- if (result == null) result = caseToolItem(opaqueToolItem);
- if (result == null) result = caseItem(opaqueToolItem);
- if (result == null) result = caseToolBarElement(opaqueToolItem);
- if (result == null) result = caseUIElement(opaqueToolItem);
- if (result == null) result = caseUILabel(opaqueToolItem);
- if (result == null) result = caseApplicationElement(opaqueToolItem);
- if (result == null) result = caseLocalizable(opaqueToolItem);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MenuPackageImpl.OPAQUE_MENU_ITEM: {
- MOpaqueMenuItem opaqueMenuItem = (MOpaqueMenuItem)theEObject;
- T1 result = caseOpaqueMenuItem(opaqueMenuItem);
- if (result == null) result = caseMenuItem(opaqueMenuItem);
- if (result == null) result = caseItem(opaqueMenuItem);
- if (result == null) result = caseMenuElement(opaqueMenuItem);
- if (result == null) result = caseUIElement(opaqueMenuItem);
- if (result == null) result = caseUILabel(opaqueMenuItem);
- if (result == null) result = caseApplicationElement(opaqueMenuItem);
- if (result == null) result = caseLocalizable(opaqueMenuItem);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MenuPackageImpl.OPAQUE_MENU_SEPARATOR: {
- MOpaqueMenuSeparator opaqueMenuSeparator = (MOpaqueMenuSeparator)theEObject;
- T1 result = caseOpaqueMenuSeparator(opaqueMenuSeparator);
- if (result == null) result = caseMenuSeparator(opaqueMenuSeparator);
- if (result == null) result = caseMenuElement(opaqueMenuSeparator);
- if (result == null) result = caseUIElement(opaqueMenuSeparator);
- if (result == null) result = caseUILabel(opaqueMenuSeparator);
- if (result == null) result = caseApplicationElement(opaqueMenuSeparator);
- if (result == null) result = caseLocalizable(opaqueMenuSeparator);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MenuPackageImpl.OPAQUE_MENU: {
- MOpaqueMenu opaqueMenu = (MOpaqueMenu)theEObject;
- T1 result = caseOpaqueMenu(opaqueMenu);
- if (result == null) result = caseMenu(opaqueMenu);
- if (result == null) result = caseMenuElement(opaqueMenu);
- if (result == null) result = caseElementContainer(opaqueMenu);
- if (result == null) result = caseUIElement(opaqueMenu);
- if (result == null) result = caseUILabel(opaqueMenu);
- if (result == null) result = caseApplicationElement(opaqueMenu);
- if (result == null) result = caseLocalizable(opaqueMenu);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
case MenuPackageImpl.DYNAMIC_MENU_CONTRIBUTION: {
MDynamicMenuContribution dynamicMenuContribution = (MDynamicMenuContribution)theEObject;
T1 result = caseDynamicMenuContribution(dynamicMenuContribution);
@@ -726,36 +608,6 @@ public class MenuSwitch<T1> extends Switch<T1> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Rendered Menu</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Rendered Menu</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseRenderedMenu(MRenderedMenu object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Rendered Tool Bar</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Rendered Tool Bar</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseRenderedToolBar(MRenderedToolBar object) {
- return null;
- }
-
- /**
* Returns the result of interpreting the object as an instance of '<em>Tool Bar Contribution</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
@@ -816,81 +668,6 @@ public class MenuSwitch<T1> extends Switch<T1> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Rendered Menu Item</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Rendered Menu Item</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseRenderedMenuItem(MRenderedMenuItem object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Opaque Tool Item</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Opaque Tool Item</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseOpaqueToolItem(MOpaqueToolItem object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Opaque Menu Item</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Opaque Menu Item</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseOpaqueMenuItem(MOpaqueMenuItem object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Opaque Menu Separator</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Opaque Menu Separator</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseOpaqueMenuSeparator(MOpaqueMenuSeparator object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Opaque Menu</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Opaque Menu</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T1 caseOpaqueMenu(MOpaqueMenu object) {
- return null;
- }
-
- /**
* Returns the result of interpreting the object as an instance of '<em>Dynamic Menu Contribution</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.java
index 6660639..d810758 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -37,7 +36,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
*
* @generated
*/
-public abstract class ModelFragmentImpl extends Container implements MModelFragment {
+public abstract class ModelFragmentImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements MModelFragment {
/**
* The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentsImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentsImpl.java
index a9e0579..f9460af 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentsImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/fragment/impl/ModelFragmentsImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -38,7 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
*
* @generated
*/
-public class ModelFragmentsImpl extends Container implements MModelFragments {
+public class ModelFragmentsImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements MModelFragments {
/**
* The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/DirectContributionItem.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/DirectContributionItem.java
index 4d251a4..5e43799 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/DirectContributionItem.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/DirectContributionItem.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2013 IBM Corporation and others.
+ * Copyright (c) 2010, 2014 IBM Corporation and others.
* 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
@@ -25,6 +25,7 @@ import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.ui.internal.workbench.Activator;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
import org.eclipse.e4.ui.internal.workbench.Policy;
+import org.eclipse.e4.ui.internal.workbench.RenderedElementUtil;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.model.application.MContribution;
import org.eclipse.e4.ui.model.application.ui.MContext;
@@ -32,7 +33,6 @@ import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
import org.eclipse.e4.ui.model.application.ui.menu.MItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
import org.eclipse.e4.ui.workbench.IPresentationEngine;
import org.eclipse.e4.ui.workbench.IResourceUtilities;
@@ -424,12 +424,12 @@ public class DirectContributionItem extends ContributionItem {
return (Menu) obj;
}
// this is a temporary passthrough of the IMenuCreator
- if (mmenu instanceof MRenderedMenu) {
- obj = ((MRenderedMenu) mmenu).getContributionManager();
+ if (RenderedElementUtil.isRenderedMenu(mmenu)) {
+ obj = RenderedElementUtil.getContributionManager(mmenu);
if (obj instanceof IContextFunction) {
final IEclipseContext lclContext = getContext(mmenu);
obj = ((IContextFunction) obj).compute(lclContext, null);
- ((MRenderedMenu) mmenu).setContributionManager(obj);
+ RenderedElementUtil.setContributionManager(mmenu, obj);
}
if (obj instanceof IMenuCreator) {
final IMenuCreator creator = (IMenuCreator) obj;
@@ -440,7 +440,7 @@ public class DirectContributionItem extends ContributionItem {
public void widgetDisposed(DisposeEvent e) {
if (menu != null && !menu.isDisposed()) {
creator.dispose();
- ((MRenderedMenu) mmenu).setWidget(null);
+ mmenu.setWidget(null);
}
}
});
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java
index 2172082..8df8a61 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java
@@ -35,6 +35,7 @@ import org.eclipse.e4.ui.bindings.EBindingService;
import org.eclipse.e4.ui.internal.workbench.Activator;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
import org.eclipse.e4.ui.internal.workbench.Policy;
+import org.eclipse.e4.ui.internal.workbench.RenderedElementUtil;
import org.eclipse.e4.ui.internal.workbench.renderers.swt.IUpdateService;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.model.application.commands.MParameter;
@@ -46,7 +47,6 @@ import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
import org.eclipse.e4.ui.model.application.ui.menu.MItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
import org.eclipse.e4.ui.workbench.IPresentationEngine;
import org.eclipse.e4.ui.workbench.IResourceUtilities;
@@ -708,12 +708,12 @@ public class HandledContributionItem extends ContributionItem {
return (Menu) obj;
}
// this is a temporary passthrough of the IMenuCreator
- if (mmenu instanceof MRenderedMenu) {
- obj = ((MRenderedMenu) mmenu).getContributionManager();
+ if (RenderedElementUtil.isRenderedMenu(mmenu)) {
+ obj = RenderedElementUtil.getContributionManager(mmenu);
if (obj instanceof IContextFunction) {
final IEclipseContext lclContext = getContext(mmenu);
obj = ((IContextFunction) obj).compute(lclContext, null);
- ((MRenderedMenu) mmenu).setContributionManager(obj);
+ RenderedElementUtil.setContributionManager(mmenu, obj);
}
if (obj instanceof IMenuCreator) {
final IMenuCreator creator = (IMenuCreator) obj;
@@ -724,7 +724,7 @@ public class HandledContributionItem extends ContributionItem {
public void widgetDisposed(DisposeEvent e) {
if (menu != null && !menu.isDisposed()) {
creator.dispose();
- ((MRenderedMenu) mmenu).setWidget(null);
+ mmenu.setWidget(null);
}
}
});
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java
index c8ad32f..3588132 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java
@@ -31,6 +31,8 @@ import org.eclipse.e4.core.contexts.RunAndTrack;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
+import org.eclipse.e4.ui.internal.workbench.RenderedElementUtil;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -46,12 +48,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
import org.eclipse.e4.ui.workbench.IResourceUtilities;
import org.eclipse.e4.ui.workbench.UIEvents;
import org.eclipse.e4.ui.workbench.swt.util.ISWTResourceUtilities;
@@ -659,11 +656,11 @@ MenuManagerEventHelper.getInstance()
if (!childME.isToBeRendered()) {
return;
}
- if (childME instanceof MRenderedMenuItem) {
- MRenderedMenuItem itemModel = (MRenderedMenuItem) childME;
+ if (RenderedElementUtil.isRenderedMenuItem(childME)) {
+ MMenuItem itemModel = (MMenuItem) childME;
processRenderedItem(menuManager, itemModel);
- } else if (childME instanceof MOpaqueMenuItem) {
- MOpaqueMenuItem itemModel = (MOpaqueMenuItem) childME;
+ } else if (OpaqueElementUtil.isOpaqueMenuItem(childME)) {
+ MMenuItem itemModel = (MMenuItem) childME;
processOpaqueItem(menuManager, itemModel);
} else if (childME instanceof MHandledMenuItem) {
MHandledMenuItem itemModel = (MHandledMenuItem) childME;
@@ -691,18 +688,18 @@ MenuManagerEventHelper.getInstance()
* @param itemModel
*/
void processRenderedItem(MenuManager parentManager,
- MRenderedMenuItem itemModel) {
+ MMenuItem itemModel) {
IContributionItem ici = getContribution(itemModel);
if (ici != null) {
return;
}
itemModel.setRenderer(this);
- Object obj = itemModel.getContributionItem();
+ Object obj = RenderedElementUtil.getContributionManager(itemModel);
if (obj instanceof IContextFunction) {
final IEclipseContext lclContext = getContext(itemModel);
ici = (IContributionItem) ((IContextFunction) obj).compute(
lclContext, null);
- itemModel.setContributionItem(ici);
+ RenderedElementUtil.setContributionManager(itemModel, ici);
} else if (obj instanceof IContributionItem) {
ici = (IContributionItem) obj;
} else {
@@ -715,13 +712,13 @@ MenuManagerEventHelper.getInstance()
linkModelToContribution(itemModel, ici);
}
- void processOpaqueItem(MenuManager parentManager, MOpaqueMenuItem itemModel) {
+ void processOpaqueItem(MenuManager parentManager, MMenuItem itemModel) {
IContributionItem ici = getContribution(itemModel);
if (ici != null) {
return;
}
itemModel.setRenderer(this);
- Object obj = itemModel.getOpaqueItem();
+ Object obj = OpaqueElementUtil.getOpaqueItem(itemModel);
if (obj instanceof IContributionItem) {
ici = (IContributionItem) obj;
} else {
@@ -906,16 +903,16 @@ MenuManagerEventHelper.getInstance()
public void reconcileManagerToModel(MenuManager menuManager, MMenu menuModel) {
List<MMenuElement> modelChildren = menuModel.getChildren();
- HashSet<MOpaqueMenuItem> oldModelItems = new HashSet<MOpaqueMenuItem>();
- HashSet<MOpaqueMenu> oldMenus = new HashSet<MOpaqueMenu>();
- HashSet<MOpaqueMenuSeparator> oldSeps = new HashSet<MOpaqueMenuSeparator>();
+ HashSet<MMenuItem> oldModelItems = new HashSet<MMenuItem>();
+ HashSet<MMenu> oldMenus = new HashSet<MMenu>();
+ HashSet<MMenuSeparator> oldSeps = new HashSet<MMenuSeparator>();
for (MMenuElement itemModel : modelChildren) {
- if (itemModel instanceof MOpaqueMenuSeparator) {
- oldSeps.add((MOpaqueMenuSeparator) itemModel);
- } else if (itemModel instanceof MOpaqueMenuItem) {
- oldModelItems.add((MOpaqueMenuItem) itemModel);
- } else if (itemModel instanceof MOpaqueMenu) {
- oldMenus.add((MOpaqueMenu) itemModel);
+ if (OpaqueElementUtil.isOpaqueMenuSeparator(itemModel)) {
+ oldSeps.add((MMenuSeparator) itemModel);
+ } else if (OpaqueElementUtil.isOpaqueMenuItem(itemModel)) {
+ oldModelItems.add((MMenuItem) itemModel);
+ } else if (OpaqueElementUtil.isOpaqueMenu(itemModel)) {
+ oldMenus.add((MMenu) itemModel);
}
}
@@ -926,8 +923,7 @@ MenuManagerEventHelper.getInstance()
MenuManager childManager = (MenuManager) item;
MMenu childModel = getMenuModel(childManager);
if (childModel == null) {
- MMenu legacyModel = MenuFactoryImpl.eINSTANCE
- .createOpaqueMenu();
+ MMenu legacyModel = OpaqueElementUtil.createOpaqueMenu();
legacyModel.setElementId(childManager.getId());
legacyModel.setVisible(childManager.isVisible());
linkModelToManager(legacyModel, childManager);
@@ -938,7 +934,7 @@ MenuManagerEventHelper.getInstance()
}
reconcileManagerToModel(childManager, legacyModel);
} else {
- if (childModel instanceof MOpaqueMenu) {
+ if (OpaqueElementUtil.isOpaqueMenu(childModel)) {
oldMenus.remove(childModel);
}
if (modelChildren.size() > dest) {
@@ -964,19 +960,19 @@ MenuManagerEventHelper.getInstance()
} else if (item.isSeparator() || item.isGroupMarker()) {
MMenuElement menuElement = getMenuElement(item);
if (menuElement == null) {
- MOpaqueMenuSeparator legacySep = MenuFactoryImpl.eINSTANCE
+ MMenuSeparator legacySep = OpaqueElementUtil
.createOpaqueMenuSeparator();
legacySep.setElementId(item.getId());
legacySep.setVisible(item.isVisible());
- legacySep.setOpaqueItem(item);
+ OpaqueElementUtil.setOpaqueItem(legacySep, item);
linkModelToContribution(legacySep, item);
if (modelChildren.size() > dest) {
modelChildren.add(dest, legacySep);
} else {
modelChildren.add(legacySep);
}
- } else if (menuElement instanceof MOpaqueMenuSeparator) {
- MOpaqueMenuSeparator legacySep = (MOpaqueMenuSeparator) menuElement;
+ } else if (OpaqueElementUtil.isOpaqueMenuSeparator(menuElement)) {
+ MMenuSeparator legacySep = (MMenuSeparator) menuElement;
oldSeps.remove(legacySep);
if (modelChildren.size() > dest) {
if (modelChildren.get(dest) != legacySep) {
@@ -990,19 +986,19 @@ MenuManagerEventHelper.getInstance()
} else {
MMenuElement menuElement = getMenuElement(item);
if (menuElement == null) {
- MOpaqueMenuItem legacyItem = MenuFactoryImpl.eINSTANCE
+ MMenuItem legacyItem = OpaqueElementUtil
.createOpaqueMenuItem();
legacyItem.setElementId(item.getId());
legacyItem.setVisible(item.isVisible());
- legacyItem.setOpaqueItem(item);
+ OpaqueElementUtil.setOpaqueItem(legacyItem, item);
linkModelToContribution(legacyItem, item);
if (modelChildren.size() > dest) {
modelChildren.add(dest, legacyItem);
} else {
modelChildren.add(legacyItem);
}
- } else if (menuElement instanceof MOpaqueMenuItem) {
- MOpaqueMenuItem legacyItem = (MOpaqueMenuItem) menuElement;
+ } else if (OpaqueElementUtil.isOpaqueMenuItem(menuElement)) {
+ MMenuItem legacyItem = (MMenuItem) menuElement;
oldModelItems.remove(legacyItem);
if (modelChildren.size() > dest) {
if (modelChildren.get(dest) != legacyItem) {
@@ -1017,23 +1013,25 @@ MenuManagerEventHelper.getInstance()
}
if (!oldModelItems.isEmpty()) {
modelChildren.removeAll(oldModelItems);
- for (MOpaqueMenuItem model : oldModelItems) {
- clearModelToContribution(model,
- (IContributionItem) model.getOpaqueItem());
+ for (MMenuItem model : oldModelItems) {
+ IContributionItem ici = (IContributionItem) OpaqueElementUtil
+ .getOpaqueItem(model);
+ clearModelToContribution(model, ici);
}
}
if (!oldMenus.isEmpty()) {
modelChildren.removeAll(oldMenus);
- for (MOpaqueMenu oldMenu : oldMenus) {
+ for (MMenu oldMenu : oldMenus) {
MenuManager oldManager = getManager(oldMenu);
clearModelToManager(oldMenu, oldManager);
}
}
if (!oldSeps.isEmpty()) {
modelChildren.removeAll(oldSeps);
- for (MOpaqueMenuSeparator model : oldSeps) {
- clearModelToContribution(model,
- (IContributionItem) model.getOpaqueItem());
+ for (MMenuSeparator model : oldSeps) {
+ IContributionItem item = (IContributionItem) OpaqueElementUtil
+ .getOpaqueItem(model);
+ clearModelToContribution(model, item);
}
}
}
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java
index 1f2676a..abb6a6c 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java
@@ -23,6 +23,7 @@ import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.ui.di.UIEventTopic;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.internal.workbench.renderers.swt.BasicPartList;
import org.eclipse.e4.ui.internal.workbench.renderers.swt.SWTRenderersMessages;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
@@ -41,8 +42,6 @@ import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.services.IStylingEngine;
import org.eclipse.e4.ui.workbench.IPresentationEngine;
@@ -1535,15 +1534,10 @@ public class StackRenderer extends LazyStackRenderer {
for (MMenuElement menuElement : viewMenu.getChildren()) {
if (menuElement.isToBeRendered() && menuElement.isVisible()) {
- if (menuElement instanceof MOpaqueMenuItem) {
- IContributionItem item = (IContributionItem) ((MOpaqueMenuItem) menuElement)
- .getOpaqueItem();
- if (item != null && item.isVisible()) {
- return true;
- }
- } else if (menuElement instanceof MOpaqueMenuSeparator) {
- IContributionItem item = (IContributionItem) ((MOpaqueMenuSeparator) menuElement)
- .getOpaqueItem();
+ if (OpaqueElementUtil.isOpaqueMenuItem(menuElement)
+ || OpaqueElementUtil.isOpaqueMenuSeparator(menuElement)) {
+ IContributionItem item = (IContributionItem) OpaqueElementUtil
+ .getOpaqueItem(menuElement);
if (item != null && item.isVisible()) {
return true;
}
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java
index 1800cf7..4629b6e 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java
@@ -30,6 +30,7 @@ import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.ui.di.UIEventTopic;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.internal.workbench.swt.CSSRenderingUtils;
import org.eclipse.e4.ui.model.application.MApplication;
@@ -40,13 +41,12 @@ import org.eclipse.e4.ui.model.application.ui.SideValue;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
import org.eclipse.e4.ui.services.IServiceConstants;
import org.eclipse.e4.ui.workbench.Selector;
import org.eclipse.e4.ui.workbench.UIEvents;
@@ -653,8 +653,8 @@ public class ToolBarManagerRenderer extends SWTPartRenderer {
*/
private void modelProcessSwitch(ToolBarManager parentManager,
MToolBarElement childME) {
- if (childME instanceof MOpaqueToolItem) {
- MOpaqueToolItem itemModel = (MOpaqueToolItem) childME;
+ if (OpaqueElementUtil.isOpaqueToolItem(childME)) {
+ MToolItem itemModel = (MToolItem) childME;
processOpaqueItem(parentManager, itemModel);
} else if (childME instanceof MHandledToolItem) {
MHandledToolItem itemModel = (MHandledToolItem) childME;
@@ -760,13 +760,14 @@ public class ToolBarManagerRenderer extends SWTPartRenderer {
}
void processOpaqueItem(ToolBarManager parentManager,
- MOpaqueToolItem itemModel) {
+ MToolItem itemModel) {
IContributionItem ici = getContribution(itemModel);
if (ici != null) {
return;
}
+
itemModel.setRenderer(this);
- Object obj = itemModel.getOpaqueItem();
+ Object obj = OpaqueElementUtil.getOpaqueItem(itemModel);
if (obj instanceof IContributionItem) {
ici = (IContributionItem) obj;
} else {
@@ -860,10 +861,10 @@ public class ToolBarManagerRenderer extends SWTPartRenderer {
public void reconcileManagerToModel(IToolBarManager menuManager,
MToolBar toolBar) {
List<MToolBarElement> modelChildren = toolBar.getChildren();
- HashSet<MOpaqueToolItem> oldModelItems = new HashSet<MOpaqueToolItem>();
+ HashSet<MToolItem> oldModelItems = new HashSet<MToolItem>();
for (MToolBarElement itemModel : modelChildren) {
- if (itemModel instanceof MOpaqueToolItem) {
- oldModelItems.add((MOpaqueToolItem) itemModel);
+ if (OpaqueElementUtil.isOpaqueToolItem(itemModel)) {
+ oldModelItems.add((MToolItem) itemModel);
}
}
@@ -872,15 +873,14 @@ public class ToolBarManagerRenderer extends SWTPartRenderer {
IContributionItem item = items[src];
MToolBarElement element = getToolElement(item);
if (element == null) {
- MOpaqueToolItem legacyItem = MenuFactoryImpl.eINSTANCE
- .createOpaqueToolItem();
+ MToolItem legacyItem = OpaqueElementUtil.createOpaqueToolItem();
legacyItem.setElementId(item.getId());
legacyItem.setVisible(item.isVisible());
- legacyItem.setOpaqueItem(item);
+ OpaqueElementUtil.setOpaqueItem(legacyItem, item);
linkModelToContribution(legacyItem, item);
modelChildren.add(dest, legacyItem);
- } else if (element instanceof MOpaqueToolItem) {
- MOpaqueToolItem legacyItem = (MOpaqueToolItem) element;
+ } else if (OpaqueElementUtil.isOpaqueToolItem(element)) {
+ MToolItem legacyItem = (MToolItem) element;
oldModelItems.remove(legacyItem);
if (modelChildren.size() > dest) {
if (modelChildren.get(dest) != legacyItem) {
@@ -895,9 +895,9 @@ public class ToolBarManagerRenderer extends SWTPartRenderer {
if (!oldModelItems.isEmpty()) {
modelChildren.removeAll(oldModelItems);
- for (MOpaqueToolItem model : oldModelItems) {
- clearModelToContribution(model,
- (IContributionItem) model.getOpaqueItem());
+ for (MToolItem model : oldModelItems) {
+ Object obj = OpaqueElementUtil.getOpaqueItem(model);
+ clearModelToContribution(model, (IContributionItem) obj);
}
}
}
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolItemRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolItemRenderer.java
index 37ddc57..2103b95 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolItemRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolItemRenderer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others.
+ * Copyright (c) 2009, 2014 IBM Corporation and others.
* 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
@@ -34,6 +34,7 @@ import org.eclipse.e4.ui.bindings.EBindingService;
import org.eclipse.e4.ui.internal.workbench.Activator;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
import org.eclipse.e4.ui.internal.workbench.Policy;
+import org.eclipse.e4.ui.internal.workbench.RenderedElementUtil;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.model.application.MContribution;
import org.eclipse.e4.ui.model.application.commands.MParameter;
@@ -44,7 +45,6 @@ import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
import org.eclipse.e4.ui.model.application.ui.menu.MItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
import org.eclipse.e4.ui.workbench.IPresentationEngine;
import org.eclipse.e4.ui.workbench.UIEvents;
@@ -432,12 +432,12 @@ public class ToolItemRenderer extends SWTPartRenderer {
return (Menu) obj;
}
// this is a temporary passthrough of the IMenuCreator
- if (mmenu instanceof MRenderedMenu) {
- obj = ((MRenderedMenu) mmenu).getContributionManager();
+ if (RenderedElementUtil.isRenderedMenu(mmenu)) {
+ obj = RenderedElementUtil.getContributionManager(mmenu);
if (obj instanceof IContextFunction) {
final IEclipseContext lclContext = getContext(mmenu);
obj = ((IContextFunction) obj).compute(lclContext, null);
- ((MRenderedMenu) mmenu).setContributionManager(obj);
+ RenderedElementUtil.setContributionManager(mmenu, obj);
}
if (obj instanceof IMenuCreator) {
final IMenuCreator creator = (IMenuCreator) obj;
@@ -448,7 +448,7 @@ public class ToolItemRenderer extends SWTPartRenderer {
public void widgetDisposed(DisposeEvent e) {
if (menu != null && !menu.isDisposed()) {
creator.dispose();
- ((MRenderedMenu) mmenu).setWidget(null);
+ mmenu.setWidget(null);
}
}
});
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4XMIResource.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4XMIResource.java
index 4a0bdb5..b9313d8 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4XMIResource.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/E4XMIResource.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others.
+ * Copyright (c) 2009, 2014 IBM Corporation and others.
* 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
@@ -11,14 +11,21 @@
package org.eclipse.e4.ui.internal.workbench;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.WeakHashMap;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EFactory;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMLHelper;
+import org.eclipse.emf.ecore.xmi.impl.XMIHelperImpl;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
public class E4XMIResource extends XMIResourceImpl {
@@ -92,4 +99,88 @@ public class E4XMIResource extends XMIResourceImpl {
setID(eObject, id);
return id;
}
+
+ /**
+ * Functional interface for creating objects
+ */
+ private interface ObjectCreator {
+ MApplicationElement create();
+ }
+
+ static final Map<String, ObjectCreator> deprecatedTypeMappings = new HashMap<String, ObjectCreator>();
+ static {
+ deprecatedTypeMappings.put("OpaqueMenu", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return OpaqueElementUtil.createOpaqueMenu();
+ }
+ });
+ deprecatedTypeMappings.put("OpaqueMenuItem", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return OpaqueElementUtil.createOpaqueMenuItem();
+ }
+ });
+ deprecatedTypeMappings.put("OpaqueMenuSeparator", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return OpaqueElementUtil.createOpaqueMenuSeparator();
+ }
+ });
+ deprecatedTypeMappings.put("OpaqueToolItem", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return OpaqueElementUtil.createOpaqueToolItem();
+ }
+ });
+ deprecatedTypeMappings.put("RenderedMenu", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return RenderedElementUtil.createRenderedMenu();
+ }
+ });
+ deprecatedTypeMappings.put("RenderedMenuItem", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return RenderedElementUtil.createRenderedMenuItem();
+ }
+ });
+ deprecatedTypeMappings.put("RenderedToolBar", new ObjectCreator() { //$NON-NLS-1$
+
+ public MApplicationElement create() {
+ return RenderedElementUtil.createRenderedToolBar();
+ }
+ });
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl#createXMLHelper()
+ */
+ @Override
+ protected XMLHelper createXMLHelper() {
+ // Handle mapping of deprecated types
+ return new XMIHelperImpl(this) {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl#createObject(org.eclipse.emf.ecore.EFactory
+ * , org.eclipse.emf.ecore.EClassifier)
+ */
+ @Override
+ public EObject createObject(EFactory eFactory, EClassifier type) {
+ if (MMenuFactory.INSTANCE == eFactory) {
+ final ObjectCreator objectCreator = deprecatedTypeMappings.get(type.getName());
+ if (objectCreator != null) {
+ return (EObject) objectCreator.create();
+ }
+ }
+ return super.createObject(eFactory, type);
+ }
+
+ };
+ }
}
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/OpaqueElementUtil.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/OpaqueElementUtil.java
new file mode 100644
index 0000000..a4b5005
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/OpaqueElementUtil.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2014 IBM Corporation and others.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.e4.ui.internal.workbench;
+
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
+
+/**
+ * Utility class that encapsulates the representation of 'opaque' menu and tool bar elements in the
+ * model.
+ */
+public class OpaqueElementUtil {
+
+ /**
+ * A tag value that indicates a menu, menu item, menu separator or tool item is 'opaque'
+ */
+ private static final String OPAQUE_TAG = "Opaque"; //$NON-NLS-1$
+
+ /**
+ * A transient value key for the 'opaque item'
+ */
+ private static final String OPAQUE_ITEM_KEY = "OpaqueItem"; //$NON-NLS-1$
+
+ /**
+ * Remove the 'opaque item' from the UI Element
+ *
+ * @param uiElement
+ * the UI element
+ * @return the removed 'opaque item' or <code>null</code>
+ */
+ public static Object clearOpaqueItem(MUIElement uiElement) {
+ return uiElement.getTransientData().remove(OPAQUE_ITEM_KEY);
+ }
+
+ /**
+ * Create an opaque menu
+ *
+ * @return a new opaque menu
+ */
+ public static MMenu createOpaqueMenu() {
+ final MMenu menu = MMenuFactory.INSTANCE.createMenu();
+ menu.getTags().add(OPAQUE_TAG);
+ return menu;
+ }
+
+ /**
+ * Create an opaque menu item
+ *
+ * @return a new opaque menu item.
+ */
+ public static MMenuItem createOpaqueMenuItem() {
+ final MMenuItem item = MMenuFactory.INSTANCE.createDirectMenuItem();
+ item.getTags().add(OPAQUE_TAG);
+ return item;
+ }
+
+ /**
+ * Create an opaque menu separator
+ *
+ * @return a new opaque menu separator
+ */
+ public static MMenuSeparator createOpaqueMenuSeparator() {
+ final MMenuSeparator separator = MMenuFactory.INSTANCE.createMenuSeparator();
+ separator.getTags().add(OPAQUE_TAG);
+ return separator;
+ }
+
+ /**
+ * Create an opaque tool item
+ *
+ * @return a new opaque tool item.
+ */
+ public static MToolItem createOpaqueToolItem() {
+ final MToolItem item = MMenuFactory.INSTANCE.createDirectToolItem();
+ item.getTags().add(OPAQUE_TAG);
+ return item;
+ }
+
+ /**
+ * Get the 'opaque item' associated with the UI Element.
+ *
+ * @param uiElement
+ * a UI element
+ * @return the opaque item or <code>null</code>
+ */
+ public static Object getOpaqueItem(MUIElement uiElement) {
+ return uiElement.getTransientData().get(OPAQUE_ITEM_KEY);
+ }
+
+ /**
+ * Tests whether a menu element is an opaque menue
+ *
+ * @param item
+ * @return <code>true</code> if the element is an 'opaque' menu
+ */
+ public static boolean isOpaqueMenu(MUIElement item) {
+ return item != null && item instanceof MMenu && item.getTags().contains(OPAQUE_TAG);
+ }
+
+ /**
+ * Tests whether a menu element is an opaque menu item
+ *
+ * @param item
+ * a menu item.
+ * @return <code>true</code> if the menu element is an 'opaque' menu item
+ */
+ public static boolean isOpaqueMenuItem(MUIElement item) {
+ return item != null && item instanceof MDirectMenuItem
+ && item.getTags().contains(OPAQUE_TAG);
+ }
+
+ /**
+ * Tests whether a menu element is an opaque menu separator
+ *
+ * @param item
+ * a menu item.
+ * @return <code>true</code> if the menu element is an 'opaque' separator
+ */
+ public static boolean isOpaqueMenuSeparator(MUIElement item) {
+ return item != null && item instanceof MMenuSeparator
+ && item.getTags().contains(OPAQUE_TAG);
+ }
+
+ /**
+ * Tests whether a UI element is an 'opaque' tool item
+ *
+ * @param uiElement
+ * a UI element.
+ * @return <code>true</code> if the tool item is 'opaque'
+ */
+ public static boolean isOpaqueToolItem(MUIElement uiElement) {
+ return uiElement != null && uiElement instanceof MDirectToolItem
+ && uiElement.getTags().contains(OPAQUE_TAG);
+ }
+
+ /**
+ * Set the 'opaque item' associated with the UI Element.
+ *
+ * @param uiElement
+ * the UI Element.
+ * @param opaqueItem
+ * the opaque item.
+ */
+ public static void setOpaqueItem(MUIElement uiElement, Object opaqueItem) {
+ uiElement.getTransientData().put(OPAQUE_ITEM_KEY, opaqueItem);
+ }
+
+}
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/RenderedElementUtil.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/RenderedElementUtil.java
new file mode 100644
index 0000000..f574e59
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/RenderedElementUtil.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2014 IBM Corporation and others.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.e4.ui.internal.workbench;
+
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
+
+/**
+ * Utility class that encapsulates the representation of 'rendered' menu and tool bar elements in
+ * the model.
+ */
+public class RenderedElementUtil {
+
+ /**
+ * A tag value that indicates a menu, menu item or tool item is 'rendered'
+ */
+ private static final String RENDERED_TAG = "Rendered"; //$NON-NLS-1$
+
+ /**
+ * A transient data key for a rendered element's 'contribution manager'.
+ */
+ private static final String CONTRIBUTION_MANAGER_KEY = "ContributionManager"; //$NON-NLS-1$
+
+ /**
+ * Create a 'rendered' menu instance
+ *
+ * @return the new instance
+ */
+ public static MMenu createRenderedMenu() {
+ final MMenu object = MMenuFactory.INSTANCE.createMenu();
+ object.getTags().add(RENDERED_TAG);
+ return object;
+
+ }
+
+ /**
+ * Create a 'rendered' menu item instance
+ *
+ * @return the new instance
+ */
+ public static MMenuItem createRenderedMenuItem() {
+ final MDirectMenuItem object = MMenuFactory.INSTANCE.createDirectMenuItem();
+ object.getTags().add(RENDERED_TAG);
+ return object;
+ }
+
+ /**
+ * Create a 'rendered' tool bar instance
+ *
+ * @return the new instance
+ */
+ public static MToolBar createRenderedToolBar() {
+ final MToolBar object = MMenuFactory.INSTANCE.createToolBar();
+ object.getTags().add(RENDERED_TAG);
+ return object;
+ }
+
+ /**
+ * Return the contribution manager value for the 'rendered' element.
+ *
+ * @param element
+ * a rendered element.
+ * @return the contribution manager or <code>null</code>
+ */
+ public static Object getContributionManager(MUIElement element) {
+ return element.getTransientData().get(CONTRIBUTION_MANAGER_KEY);
+ }
+
+ /**
+ * Test whether the UI element is an 'rendered' menu.
+ *
+ * @param element
+ * the UI element
+ * @return <code>true</code> if the element is a 'rendered' menu
+ */
+ public static boolean isRenderedMenu(MUIElement element) {
+ return element instanceof MMenu && element.getTags().contains(RENDERED_TAG);
+ }
+
+ /**
+ * Test whether the UI element is a 'rendered' menu item.
+ *
+ * @param element
+ * a UI element
+ * @return <code>true</code> if the element is a 'rendered' menu item
+ */
+ public static boolean isRenderedMenuItem(MUIElement element) {
+ return element instanceof MDirectMenuItem && element.getTags().contains(RENDERED_TAG);
+ }
+
+ /**
+ * Set the contribution manager value for a 'rendered' element.
+ *
+ * @param element
+ * a rendered element
+ * @param contributionManager
+ * a contribution manager
+ */
+ public static void setContributionManager(MUIElement element, Object contributionManager) {
+ element.getTransientData().put(CONTRIBUTION_MANAGER_KEY, contributionManager);
+ }
+}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
index 5dc04b4..e439fc0 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2013 IBM Corporation and others.
+ * Copyright (c) 2011, 2014 IBM Corporation and others.
* 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
@@ -13,13 +13,13 @@ package org.eclipse.ui.internal;
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.SideValue;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
@@ -735,7 +735,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa
container.getChildren().add(toolItem);
}
} else {
- MOpaqueToolItem toolItem = MenuFactoryImpl.eINSTANCE.createOpaqueToolItem();
+ MToolItem toolItem = OpaqueElementUtil.createOpaqueToolItem();
toolItem.setElementId(item.getId());
if (item instanceof AbstractGroupMarker) {
toolItem.setVisible(item.isVisible());
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java
index ca36fb4..f9b4a5b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PopupMenuExtender.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
* 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
@@ -26,6 +26,7 @@ import org.eclipse.core.runtime.IRegistryChangeListener;
import org.eclipse.core.runtime.Platform;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.internal.workbench.swt.MenuService;
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
@@ -33,8 +34,6 @@ import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
import org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
import org.eclipse.e4.ui.workbench.renderers.swt.MenuManagerRenderer;
@@ -567,19 +566,12 @@ public class PopupMenuExtender implements IMenuListener2,
*/
private void unlink(MenuManagerRenderer renderer, MMenu menu) {
for (MMenuElement menuElement : menu.getChildren()) {
- if (menuElement instanceof MOpaqueMenuItem) {
- MOpaqueMenuItem opaqueMenuItem = (MOpaqueMenuItem) menuElement;
- Object item = opaqueMenuItem.getOpaqueItem();
+ if (OpaqueElementUtil.isOpaqueMenuItem(menuElement)
+ || OpaqueElementUtil.isOpaqueMenuSeparator(menuElement)) {
+ Object item = OpaqueElementUtil.getOpaqueItem(menuElement);
if (item instanceof IContributionItem) {
- renderer.clearModelToContribution(opaqueMenuItem, (IContributionItem) item);
- opaqueMenuItem.setOpaqueItem(null);
- }
- } else if (menuElement instanceof MOpaqueMenuSeparator) {
- MOpaqueMenuSeparator opaqueMenuItem = (MOpaqueMenuSeparator) menuElement;
- Object item = opaqueMenuItem.getOpaqueItem();
- if (item instanceof IContributionItem) {
- renderer.clearModelToContribution(opaqueMenuItem, (IContributionItem) item);
- opaqueMenuItem.setOpaqueItem(null);
+ renderer.clearModelToContribution(menuElement, (IContributionItem) item);
+ OpaqueElementUtil.clearOpaqueItem(menuElement);
}
} else if (menuElement instanceof MMenu) {
MMenu subMenu = (MMenu) menuElement;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
index a30b984..b63e68e 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -52,6 +52,7 @@ import org.eclipse.e4.core.di.annotations.Optional;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.ui.internal.workbench.E4Workbench;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.internal.workbench.PartServiceSaveHandler;
import org.eclipse.e4.ui.internal.workbench.URIHelper;
import org.eclipse.e4.ui.internal.workbench.renderers.swt.IUpdateService;
@@ -70,7 +71,6 @@ import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
import org.eclipse.e4.ui.model.internal.Position;
@@ -1188,7 +1188,7 @@ public class WorkbenchWindow implements IWorkbenchWindow {
menu.getChildren().add(separator);
manager.remove(item);
} else {
- MOpaqueMenuItem menuItem = MenuFactoryImpl.eINSTANCE.createOpaqueMenuItem();
+ MMenuItem menuItem = OpaqueElementUtil.createOpaqueMenuItem();
menuItem.setElementId(item.getId());
menuItem.setVisible(item.isVisible());
menu.getChildren().add(menuItem);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
index 8cfbbc7..8834d5f 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/CustomizePerspectiveDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
* 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
@@ -31,6 +31,7 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.e4.core.commands.ECommandService;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.bindings.EBindingService;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.commands.MParameter;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
@@ -41,8 +42,6 @@ import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
@@ -3075,7 +3074,7 @@ public class CustomizePerspectiveDialog extends TrayDialog {
dynamicEntry.setCheckState(getMenuItemIsVisible(dynamicEntry));
parent.addChild(dynamicEntry);
}
- } else if (menuItem instanceof MOpaqueMenuItem) {
+ } else if (OpaqueElementUtil.isOpaqueMenuItem(menuItem)) {
IContributionItem contributionItem = menuMngrRenderer.getContribution(menuItem);
if (contributionItem instanceof ActionContributionItem) {
final IAction action = ((ActionContributionItem) contributionItem).getAction();
@@ -3176,7 +3175,7 @@ public class CustomizePerspectiveDialog extends TrayDialog {
continue;
}
- if (element instanceof MOpaqueToolItem) {
+ if (OpaqueElementUtil.isOpaqueToolItem(element)) {
if (contributionItem instanceof ActionContributionItem) {
final IAction action = ((ActionContributionItem) contributionItem).getAction();
DisplayItem toolbarEntry = new DisplayItem(action.getText(), contributionItem);
@@ -3272,13 +3271,13 @@ public class CustomizePerspectiveDialog extends TrayDialog {
text = text + " (" + sequence.format() + ')'; //$NON-NLS-1$
}
return text;
- } else if (item instanceof MOpaqueMenuItem) {
- Object opaque = ((MOpaqueMenuItem) item).getOpaqueItem();
+ } else if (OpaqueElementUtil.isOpaqueMenuItem(item)) {
+ Object opaque = OpaqueElementUtil.getOpaqueItem(item);
if (opaque instanceof ActionContributionItem) {
return ((ActionContributionItem) opaque).getAction().getText();
}
- } else if (item instanceof MOpaqueToolItem) {
- Object opaque = ((MOpaqueToolItem) item).getOpaqueItem();
+ } else if (OpaqueElementUtil.isOpaqueToolItem(item)) {
+ Object opaque = OpaqueElementUtil.getOpaqueItem(item);
if (opaque instanceof ActionContributionItem) {
return ((ActionContributionItem) opaque).getAction().getToolTipText();
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java
index 5605e2c..38eaf57 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 IBM Corporation and others.
+ * Copyright (c) 2009, 2014 IBM Corporation and others.
* 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
@@ -17,14 +17,11 @@ import org.eclipse.e4.core.contexts.ContextFunction;
import org.eclipse.e4.core.contexts.IContextFunction;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
@@ -230,11 +227,11 @@ public class CompatibilityView extends CompatibilityPart {
renderer.clearModelToContribution(child, contribution);
}
- if (child instanceof MOpaqueMenuSeparator) {
- ((MOpaqueMenuSeparator) child).setOpaqueItem(null);
+ if (OpaqueElementUtil.isOpaqueMenuSeparator(child)) {
+ OpaqueElementUtil.clearOpaqueItem(child);
it.remove();
- } else if (child instanceof MOpaqueMenuItem) {
- ((MOpaqueMenuItem) child).setOpaqueItem(null);
+ } else if (OpaqueElementUtil.isOpaqueMenuItem(child)) {
+ OpaqueElementUtil.clearOpaqueItem(child);
it.remove();
} else if (child instanceof MMenu) {
MMenu submenu = (MMenu) child;
@@ -243,7 +240,7 @@ public class CompatibilityView extends CompatibilityPart {
renderer.clearModelToManager(submenu, manager);
}
- if (child instanceof MOpaqueMenu) {
+ if (OpaqueElementUtil.isOpaqueMenu(child)) {
it.remove();
}
clearOpaqueMenuItems(renderer, submenu);
@@ -280,13 +277,13 @@ public class CompatibilityView extends CompatibilityPart {
// remove opaque mappings
for (Iterator<MToolBarElement> it = toolbar.getChildren().iterator(); it.hasNext();) {
MToolBarElement element = it.next();
- if (element instanceof MOpaqueToolItem) {
+ if (OpaqueElementUtil.isOpaqueToolItem(element)) {
IContributionItem item = tbmr.getContribution(element);
if (item != null) {
tbmr.clearModelToContribution(element, item);
}
// clear the reference
- ((MOpaqueToolItem) element).setOpaqueItem(null);
+ OpaqueElementUtil.clearOpaqueItem(element);
// remove the opaque item
it.remove();
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java
index d5e698c..dbc59fb 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/ContributionFactoryGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2013 IBM Corporation and others.
+ * Copyright (c) 2012, 2014 IBM Corporation and others.
* 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
@@ -20,12 +20,12 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.e4.core.contexts.ContextFunction;
import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.ui.internal.workbench.OpaqueElementUtil;
import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.impl.UiFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MOpaqueToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.services.ServiceLocator;
@@ -116,16 +116,16 @@ public class ContributionFactoryGenerator extends ContextFunction {
}
private MUIElement createMenuItem(IContributionItem ici) {
- MOpaqueMenuItem opaqueItem = MenuFactoryImpl.eINSTANCE.createOpaqueMenuItem();
+ MMenuItem opaqueItem = OpaqueElementUtil.createOpaqueMenuItem();
opaqueItem.setElementId(ici.getId());
- opaqueItem.setOpaqueItem(ici);
+ OpaqueElementUtil.setOpaqueItem(opaqueItem, ici);
return opaqueItem;
}
private MUIElement createToolItem(IContributionItem ici) {
- MOpaqueToolItem opaqueItem = MenuFactoryImpl.eINSTANCE.createOpaqueToolItem();
+ MToolItem opaqueItem = OpaqueElementUtil.createOpaqueToolItem();
opaqueItem.setElementId(ici.getId());
- opaqueItem.setOpaqueItem(ici);
+ OpaqueElementUtil.setOpaqueItem(opaqueItem, ici);
return opaqueItem;
}
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java
index c4906bb..47b7947 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuAdditionCacheEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2013 IBM Corporation and others.
+ * Copyright (c) 2006, 2014 IBM Corporation and others.
* 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
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.e4.core.contexts.ContextFunction;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.internal.workbench.RenderedElementUtil;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.MApplicationElement;
import org.eclipse.e4.ui.model.application.commands.MCommand;
@@ -31,7 +32,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
@@ -220,9 +221,9 @@ public class MenuAdditionCacheEntry {
}
};
- MRenderedMenuItem menuItem = MenuFactoryImpl.eINSTANCE.createRenderedMenuItem();
+ MMenuItem menuItem = RenderedElementUtil.createRenderedMenuItem();
menuItem.setElementId(id);
- menuItem.setContributionItem(generator);
+ RenderedElementUtil.setContributionManager(menuItem, generator);
menuItem.setVisibleWhen(MenuHelper.getVisibleWhen(child));
container.getChildren().add(menuItem);
}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java
index 643c041..5186ada 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2013 IBM Corporation and others.
+ * Copyright (c) 2010, 2014 IBM Corporation and others.
* 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
@@ -39,6 +39,7 @@ import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
+import org.eclipse.e4.ui.internal.workbench.RenderedElementUtil;
import org.eclipse.e4.ui.internal.workbench.swt.Policy;
import org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator;
import org.eclipse.e4.ui.model.application.MApplication;
@@ -57,8 +58,6 @@ import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
@@ -498,7 +497,7 @@ public class MenuHelper {
String pulldown = element.getAttribute("pulldown"); //$NON-NLS-1$
if (IWorkbenchRegistryConstants.STYLE_PULLDOWN.equals(style)
|| (pulldown != null && pulldown.equals("true"))) { //$NON-NLS-1$
- MRenderedMenuItem item = MenuFactoryImpl.eINSTANCE.createRenderedMenuItem();
+ MMenuItem item = RenderedElementUtil.createRenderedMenuItem();
item.setLabel(text);
if (iconUri != null) {
item.setIconURI(iconUri);
@@ -522,7 +521,7 @@ public class MenuHelper {
};
}
};
- item.setContributionItem(generator);
+ RenderedElementUtil.setContributionManager(item, generator);
return item;
}
@@ -595,7 +594,7 @@ public class MenuHelper {
if (IWorkbenchRegistryConstants.STYLE_PULLDOWN.equals(style)
|| (pulldown != null && pulldown.equals("true"))) { //$NON-NLS-1$
- MRenderedMenu menu = MenuFactoryImpl.eINSTANCE.createRenderedMenu();
+ MMenu menu = RenderedElementUtil.createRenderedMenu();
ECommandService cs = app.getContext().get(ECommandService.class);
final ParameterizedCommand parmCmd = cs.createCommand(cmdId, null);
IContextFunction generator = new ContextFunction() {
@@ -653,7 +652,7 @@ public class MenuHelper {
};
}
};
- menu.setContributionManager(generator);
+ RenderedElementUtil.setContributionManager(menu, generator);
item.setMenu(menu);
}