diff options
| author | Eric Moffatt | 2011-09-02 17:54:08 +0000 |
|---|---|---|
| committer | Eric Moffatt | 2011-09-02 17:54:08 +0000 |
| commit | 3cdbc05b880012119af0bedab9c6db29b2641806 (patch) | |
| tree | 03109d294317f4fb9640fb16578f3063864dcddd | |
| parent | 27a9917c98854bce6720d0f24a0829bf3b9347c3 (diff) | |
| download | eclipse.platform.ui-3cdbc05b880012119af0bedab9c6db29b2641806.tar.gz eclipse.platform.ui-3cdbc05b880012119af0bedab9c6db29b2641806.tar.xz eclipse.platform.ui-3cdbc05b880012119af0bedab9c6db29b2641806.zip | |
Fix for Bug 355101 - Cloneable Snippets is part of the wrong modelv20110902-1754
element
115 files changed, 1874 insertions, 2531 deletions
diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Application.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Application.gif Binary files differnew file mode 100644 index 00000000000..7acbca393c0 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Application.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Area.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Area.gif Binary files differnew file mode 100644 index 00000000000..ffebaf4f06c --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Area.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_DirectMenuItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_DirectMenuItem.gif Binary files differnew file mode 100644 index 00000000000..84d32674ac7 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_DirectMenuItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_DirectToolItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_DirectToolItem.gif Binary files differnew file mode 100644 index 00000000000..e0f28471cd7 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_DirectToolItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_HandledMenuItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_HandledMenuItem.gif Binary files differnew file mode 100644 index 00000000000..a2ea8fe4fb0 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_HandledMenuItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_HandledToolItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_HandledToolItem.gif Binary files differnew file mode 100644 index 00000000000..df29197e262 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_HandledToolItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_InputPart.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_InputPart.gif Binary files differnew file mode 100644 index 00000000000..f82b4be3227 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_InputPart.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Menu.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Menu.gif Binary files differnew file mode 100644 index 00000000000..f4369fd0a4e --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Menu.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_MenuContribution.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_MenuContribution.gif Binary files differnew file mode 100644 index 00000000000..e441ba7d418 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_MenuContribution.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_MenuSeparator.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_MenuSeparator.gif Binary files differnew file mode 100644 index 00000000000..053b43458eb --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_MenuSeparator.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenu.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenu.gif Binary files differnew file mode 100644 index 00000000000..f4369fd0a4e --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenu.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenuItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenuItem.gif Binary files differnew file mode 100644 index 00000000000..3744cee6aec --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenuItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenuSeparator.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenuSeparator.gif Binary files differnew file mode 100644 index 00000000000..053b43458eb --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueMenuSeparator.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueToolItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueToolItem.gif Binary files differnew file mode 100644 index 00000000000..58edd523d02 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_OpaqueToolItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Part.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Part.gif Binary files differnew file mode 100644 index 00000000000..852e7907209 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Part.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PartSashContainer.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PartSashContainer.gif Binary files differnew file mode 100644 index 00000000000..73f16499bfc --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PartSashContainer.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PartStack.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PartStack.gif Binary files differnew file mode 100644 index 00000000000..1650299672d --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PartStack.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Perspective.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Perspective.gif Binary files differnew file mode 100644 index 00000000000..b2556694e4c --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Perspective.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PerspectiveStack.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PerspectiveStack.gif Binary files differnew file mode 100644 index 00000000000..bbdb41d8452 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PerspectiveStack.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Placeholder.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Placeholder.gif Binary files differnew file mode 100644 index 00000000000..691dd114dee --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Placeholder.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PopupMenu.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PopupMenu.gif Binary files differnew file mode 100644 index 00000000000..691dd114dee --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_PopupMenu.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedMenu.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedMenu.gif Binary files differnew file mode 100644 index 00000000000..f82b4be3227 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedMenu.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedMenuItem.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedMenuItem.gif Binary files differnew file mode 100644 index 00000000000..4b36c8a973d --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedMenuItem.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedToolBar.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedToolBar.gif Binary files differnew file mode 100644 index 00000000000..84d32674ac7 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_RenderedToolBar.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBar.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBar.gif Binary files differnew file mode 100644 index 00000000000..2d3a78e68de --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBar.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBarContribution.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBarContribution.gif Binary files differnew file mode 100644 index 00000000000..72a560fe4a2 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBarContribution.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBarSeparator.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBarSeparator.gif Binary files differnew file mode 100644 index 00000000000..13e215edfc7 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolBarSeparator.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolControl.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolControl.gif Binary files differnew file mode 100644 index 00000000000..8b41d35c74d --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_ToolControl.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimBar.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimBar.gif Binary files differnew file mode 100644 index 00000000000..fd5f7bbdc88 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimBar.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimContribution.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimContribution.gif Binary files differnew file mode 100644 index 00000000000..72a560fe4a2 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimContribution.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimmedWindow.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimmedWindow.gif Binary files differnew file mode 100644 index 00000000000..24f4a759d72 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_TrimmedWindow.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Window.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Window.gif Binary files differnew file mode 100644 index 00000000000..0c070475d5d --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/ctool16/CreateSnippetContainer_snippets_Window.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/SnippetContainer.gif b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/SnippetContainer.gif Binary files differnew file mode 100644 index 00000000000..90d10f94707 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/icons/full/obj16/SnippetContainer.gif diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties b/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties index cc681f2db7d..ebdbc35962a 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/plugin.properties @@ -279,3 +279,5 @@ _UI_ApplicationElement_transientData_feature = Transient Data _UI_StringToObjectMap_type = String To Object Map _UI_StringToObjectMap_key_feature = Key _UI_StringToObjectMap_value_feature = Value +_UI_SnippetContainer_type = Snippet Container +_UI_SnippetContainer_snippets_feature = Snippets diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingContextItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingContextItemProvider.java index 009f67c2ee5..1e314dad0e8 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingContextItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingContextItemProvider.java @@ -214,29 +214,6 @@ public class BindingContextItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.BINDING_CONTEXT__CHILDREN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingTableItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingTableItemProvider.java index df80a128a4a..9869f70b0ea 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingTableItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/BindingTableItemProvider.java @@ -187,29 +187,6 @@ public class BindingTableItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.BINDING_TABLE__BINDINGS; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/CommandItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/CommandItemProvider.java index a269d5d0cbd..a33ea9041cc 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/CommandItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/CommandItemProvider.java @@ -237,29 +237,6 @@ public class CommandItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.COMMAND__PARAMETERS; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/KeyBindingItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/KeyBindingItemProvider.java index 7eae70860bf..fcfd5ddcf61 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/KeyBindingItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/commands/provider/KeyBindingItemProvider.java @@ -214,29 +214,6 @@ public class KeyBindingItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.KEY_BINDING__PARAMETERS; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/descriptor/basic/provider/PartDescriptorItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/descriptor/basic/provider/PartDescriptorItemProvider.java index 4bc3c62d654..c44ac8bd67e 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/descriptor/basic/provider/PartDescriptorItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/descriptor/basic/provider/PartDescriptorItemProvider.java @@ -444,31 +444,6 @@ public class PartDescriptorItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS || - childFeature == BasicPackageImpl.Literals.PART_DESCRIPTOR__MENUS || - childFeature == BasicPackageImpl.Literals.PART_DESCRIPTOR__TOOLBAR; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java index ae672b728aa..1e0b7dea160 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationElementItemProvider.java @@ -168,36 +168,6 @@ public class ApplicationElementItemProvider } /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { - if (childrenFeatures == null) { - super.getChildrenFeatures(object); - childrenFeatures.add(ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS); - } - return childrenFeatures; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EStructuralFeature getChildFeature(Object object, Object child) { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. - - return super.getChildFeature(object, child); - } - - /** * This returns ApplicationElement.gif. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -240,9 +210,6 @@ public class ApplicationElementItemProvider case ApplicationPackageImpl.APPLICATION_ELEMENT__TRANSIENT_DATA: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); - return; } super.notifyChanged(notification); } @@ -257,221 +224,6 @@ public class ApplicationElementItemProvider @Override protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MApplicationFactory.INSTANCE.createApplication())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MApplicationFactory.INSTANCE.createAddon())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createBindingContext())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createBindingTable())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createCommand())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createCommandParameter())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createHandler())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createKeyBinding())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createParameter())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MCommandsFactory.INSTANCE.createCategory())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MUiFactory.INSTANCE.createCoreExpression())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createMenuSeparator())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createMenu())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createMenuContribution())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createPopupMenu())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createDirectMenuItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createHandledMenuItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createToolBar())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createToolControl())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createHandledToolItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createDirectToolItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createToolBarSeparator())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createRenderedMenu())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createRenderedToolBar())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createToolBarContribution())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createTrimContribution())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createRenderedMenuItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createOpaqueToolItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createOpaqueMenuItem())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createOpaqueMenuSeparator())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MMenuFactory.INSTANCE.createOpaqueMenu())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createPart())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createInputPart())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createPartStack())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createPartSashContainer())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createWindow())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createTrimmedWindow())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MBasicFactory.INSTANCE.createTrimBar())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MAdvancedFactory.INSTANCE.createPlaceholder())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MAdvancedFactory.INSTANCE.createPerspective())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MAdvancedFactory.INSTANCE.createPerspectiveStack())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - MAdvancedFactory.INSTANCE.createArea())); - - newChildDescriptors.add - (createChildParameter - (ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS, - org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory.INSTANCE.createPartDescriptor())); } /** diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProvider.java index 72c7a64f6f0..d88af94d4a5 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/provider/ApplicationItemProvider.java @@ -19,6 +19,7 @@ import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl; import org.eclipse.e4.ui.model.application.descriptor.basic.MBasicFactory; import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl; import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl; +import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory; import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory; import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl; @@ -162,6 +163,7 @@ public class ApplicationItemProvider extends ElementContainerItemProvider childrenFeatures.add(MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS); childrenFeatures.add(MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS); childrenFeatures.add(MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS); + childrenFeatures.add(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS); childrenFeatures.add(ApplicationPackageImpl.Literals.APPLICATION__COMMANDS); childrenFeatures.add(ApplicationPackageImpl.Literals.APPLICATION__ADDONS); childrenFeatures.add(ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES); @@ -230,6 +232,7 @@ public class ApplicationItemProvider extends ElementContainerItemProvider case ApplicationPackageImpl.APPLICATION__MENU_CONTRIBUTIONS: case ApplicationPackageImpl.APPLICATION__TOOL_BAR_CONTRIBUTIONS: case ApplicationPackageImpl.APPLICATION__TRIM_CONTRIBUTIONS: + case ApplicationPackageImpl.APPLICATION__SNIPPETS: case ApplicationPackageImpl.APPLICATION__COMMANDS: case ApplicationPackageImpl.APPLICATION__ADDONS: case ApplicationPackageImpl.APPLICATION__CATEGORIES: @@ -293,6 +296,166 @@ public class ApplicationItemProvider extends ElementContainerItemProvider newChildDescriptors.add (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MApplicationFactory.INSTANCE.createApplication())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createMenuSeparator())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createMenuContribution())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createPopupMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createDirectMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createHandledMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolBar())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolControl())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createHandledToolItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createDirectToolItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolBarSeparator())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createRenderedMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createRenderedToolBar())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolBarContribution())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createTrimContribution())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createRenderedMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueToolItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueMenuSeparator())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createPart())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createInputPart())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createPartStack())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createPartSashContainer())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createWindow())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createTrimmedWindow())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory.INSTANCE.createTrimBar())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createPlaceholder())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createPerspective())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createPerspectiveStack())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createArea())); + + newChildDescriptors.add + (createChildParameter (ApplicationPackageImpl.Literals.APPLICATION__COMMANDS, MCommandsFactory.INSTANCE.createCommand())); @@ -319,19 +482,11 @@ public class ApplicationItemProvider extends ElementContainerItemProvider Object childObject = child; boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == ApplicationPackageImpl.Literals.APPLICATION__ADDONS || - childFeature == CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__ROOT_CONTEXT || - childFeature == CommandsPackageImpl.Literals.BINDING_TABLE_CONTAINER__BINDING_TABLES || - childFeature == ApplicationPackageImpl.Literals.APPLICATION__COMMANDS || - childFeature == CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS || - childFeature == ApplicationPackageImpl.Literals.APPLICATION__CATEGORIES || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || + childFeature == UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS || childFeature == MenuPackageImpl.Literals.MENU_CONTRIBUTIONS__MENU_CONTRIBUTIONS || childFeature == MenuPackageImpl.Literals.TOOL_BAR_CONTRIBUTIONS__TOOL_BAR_CONTRIBUTIONS || - childFeature == MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS || - childFeature == BasicPackageImpl.Literals.PART_DESCRIPTOR_CONTAINER__DESCRIPTORS; + childFeature == MenuPackageImpl.Literals.TRIM_CONTRIBUTIONS__TRIM_CONTRIBUTIONS; if (qualify) { return getString diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/AreaItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/AreaItemProvider.java index 04183092cc4..cc9ca67d807 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/AreaItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/AreaItemProvider.java @@ -207,30 +207,6 @@ public class AreaItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveItemProvider.java index aee5ae2c426..541b7c4208a 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveItemProvider.java @@ -312,9 +312,7 @@ public class PerspectiveItemProvider Object childObject = child; boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || childFeature == AdvancedPackageImpl.Literals.PERSPECTIVE__WINDOWS; if (qualify) { diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveStackItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveStackItemProvider.java index 461437607bb..c3143e7d0d8 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveStackItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PerspectiveStackItemProvider.java @@ -345,30 +345,6 @@ public class PerspectiveStackItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PlaceholderItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PlaceholderItemProvider.java index 9d23000cbf1..765f91549d4 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PlaceholderItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/advanced/provider/PlaceholderItemProvider.java @@ -174,29 +174,6 @@ public class PlaceholderItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/InputPartItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/InputPartItemProvider.java index 668a3c59c64..b3776ab5b13 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/InputPartItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/InputPartItemProvider.java @@ -148,30 +148,4 @@ public class InputPartItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || - childFeature == BasicPackageImpl.Literals.PART__MENUS || - childFeature == BasicPackageImpl.Literals.PART__TOOLBAR; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartItemProvider.java index bbb7044aa34..6288310ad86 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartItemProvider.java @@ -502,32 +502,6 @@ public class PartItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || - childFeature == BasicPackageImpl.Literals.PART__MENUS || - childFeature == BasicPackageImpl.Literals.PART__TOOLBAR; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartSashContainerItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartSashContainerItemProvider.java index 80f9f76cabe..9d62d4e2bc0 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartSashContainerItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartSashContainerItemProvider.java @@ -118,30 +118,6 @@ public class PartSashContainerItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartStackItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartStackItemProvider.java index 131affae2d1..88a55624fbf 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartStackItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/PartStackItemProvider.java @@ -118,30 +118,6 @@ public class PartStackItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimBarItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimBarItemProvider.java index 88d8ad71ee0..282c2a0fdae 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimBarItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimBarItemProvider.java @@ -118,30 +118,6 @@ public class TrimBarItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimElementItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimElementItemProvider.java index 1902a57470e..907142564aa 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimElementItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimElementItemProvider.java @@ -107,29 +107,6 @@ public class TrimElementItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimmedWindowItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimmedWindowItemProvider.java index 8cd3c5674d4..a39dcb0bf31 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimmedWindowItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/TrimmedWindowItemProvider.java @@ -166,13 +166,11 @@ public class TrimmedWindowItemProvider extends WindowItemProvider implements Object childObject = child; boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || + childFeature == UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS || childFeature == BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS || childFeature == BasicPackageImpl.Literals.WINDOW__WINDOWS || childFeature == BasicPackageImpl.Literals.TRIMMED_WINDOW__TRIM_BARS || - childFeature == CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || childFeature == BasicPackageImpl.Literals.WINDOW__MAIN_MENU; if (qualify) { diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/WindowItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/WindowItemProvider.java index 907a280d747..553dbfd02cc 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/WindowItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/basic/provider/WindowItemProvider.java @@ -346,6 +346,7 @@ public class WindowItemProvider super.getChildrenFeatures(object); childrenFeatures.add(UiPackageImpl.Literals.CONTEXT__PROPERTIES); childrenFeatures.add(CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS); + childrenFeatures.add(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS); childrenFeatures.add(BasicPackageImpl.Literals.WINDOW__MAIN_MENU); childrenFeatures.add(BasicPackageImpl.Literals.WINDOW__WINDOWS); childrenFeatures.add(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS); @@ -417,6 +418,7 @@ public class WindowItemProvider return; case BasicPackageImpl.WINDOW__PROPERTIES: case BasicPackageImpl.WINDOW__HANDLERS: + case BasicPackageImpl.WINDOW__SNIPPETS: case BasicPackageImpl.WINDOW__MAIN_MENU: case BasicPackageImpl.WINDOW__WINDOWS: case BasicPackageImpl.WINDOW__SHARED_ELEMENTS: @@ -449,6 +451,166 @@ public class WindowItemProvider newChildDescriptors.add (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createPart())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createInputPart())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createPartStack())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createPartSashContainer())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createWindow())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createTrimmedWindow())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MBasicFactory.INSTANCE.createTrimBar())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MApplicationFactory.INSTANCE.createApplication())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createMenuSeparator())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createMenuContribution())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createPopupMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createDirectMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createHandledMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolBar())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolControl())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createHandledToolItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createDirectToolItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolBarSeparator())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createRenderedMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createRenderedToolBar())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createToolBarContribution())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createTrimContribution())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createRenderedMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueToolItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueMenuItem())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueMenuSeparator())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MMenuFactory.INSTANCE.createOpaqueMenu())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createPlaceholder())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createPerspective())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createPerspectiveStack())); + + newChildDescriptors.add + (createChildParameter + (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS, + MAdvancedFactory.INSTANCE.createArea())); + + newChildDescriptors.add + (createChildParameter (BasicPackageImpl.Literals.WINDOW__MAIN_MENU, MMenuFactory.INSTANCE.createMenu())); @@ -650,12 +812,10 @@ public class WindowItemProvider Object childObject = child; boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || + childFeature == UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS || childFeature == BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS || childFeature == BasicPackageImpl.Literals.WINDOW__WINDOWS || - childFeature == CommandsPackageImpl.Literals.HANDLER_CONTAINER__HANDLERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || childFeature == BasicPackageImpl.Literals.WINDOW__MAIN_MENU; if (qualify) { diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectMenuItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectMenuItemItemProvider.java index 15c7a2aaaaa..688acade47f 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectMenuItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectMenuItemItemProvider.java @@ -195,27 +195,4 @@ public class DirectMenuItemItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectToolItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectToolItemItemProvider.java index 518a237441b..bb3ac15d9a7 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectToolItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/DirectToolItemItemProvider.java @@ -195,28 +195,4 @@ public class DirectToolItemItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == MenuPackageImpl.Literals.TOOL_ITEM__MENU || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledItemItemProvider.java index 174fca64ccd..9dee005aa60 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledItemItemProvider.java @@ -210,28 +210,4 @@ public class HandledItemItemProvider MCommandsFactory.INSTANCE.createParameter())); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledMenuItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledMenuItemItemProvider.java index a2db547c349..267de766808 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledMenuItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledMenuItemItemProvider.java @@ -210,28 +210,4 @@ public class HandledMenuItemItemProvider MCommandsFactory.INSTANCE.createParameter())); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledToolItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledToolItemItemProvider.java index f1024057e83..dfec79f8382 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledToolItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/HandledToolItemItemProvider.java @@ -210,29 +210,4 @@ public class HandledToolItemItemProvider MCommandsFactory.INSTANCE.createParameter())); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == MenuPackageImpl.Literals.TOOL_ITEM__MENU || - childFeature == MenuPackageImpl.Literals.HANDLED_ITEM__PARAMETERS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ItemItemProvider.java index 069980fb8a9..1197ac1b604 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ItemItemProvider.java @@ -271,29 +271,6 @@ public class ItemItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuContributionItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuContributionItemProvider.java index 9f935bcf3fb..e2ab91d0e55 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuContributionItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuContributionItemProvider.java @@ -175,30 +175,6 @@ public class MenuContributionItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuElementItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuElementItemProvider.java index 2e85ab89e14..290fd7b0b71 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuElementItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuElementItemProvider.java @@ -212,29 +212,6 @@ public class MenuElementItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemItemProvider.java index 04b37dded57..4795a60e90e 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemItemProvider.java @@ -147,27 +147,4 @@ public class MenuItemItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemProvider.java index cbfd9f1aab0..2aff8d78c8b 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuItemProvider.java @@ -368,28 +368,4 @@ public class MenuItemProvider MAdvancedFactory.INSTANCE.createArea())); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuSeparatorItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuSeparatorItemProvider.java index 70b26e7ee0d..c005a7adf26 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuSeparatorItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/MenuSeparatorItemProvider.java @@ -114,27 +114,4 @@ public class MenuSeparatorItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemItemProvider.java index 31be359a573..9d918816ad2 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemItemProvider.java @@ -151,27 +151,4 @@ public class OpaqueMenuItemItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemProvider.java index 41f31bb6de3..2951a3cbd19 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuItemProvider.java @@ -117,28 +117,4 @@ public class OpaqueMenuItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuSeparatorItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuSeparatorItemProvider.java index 11b6c487378..9d701bba38c 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuSeparatorItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueMenuSeparatorItemProvider.java @@ -151,27 +151,4 @@ public class OpaqueMenuSeparatorItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueToolItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueToolItemItemProvider.java index 933ba7753c9..1b93a4c004d 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueToolItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/OpaqueToolItemItemProvider.java @@ -153,28 +153,4 @@ public class OpaqueToolItemItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == MenuPackageImpl.Literals.TOOL_ITEM__MENU || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/PopupMenuItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/PopupMenuItemProvider.java index 783aa246c2d..662bf542b9a 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/PopupMenuItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/PopupMenuItemProvider.java @@ -212,28 +212,4 @@ public class PopupMenuItemProvider ((EFactory)MApplicationFactory.INSTANCE).create(ApplicationPackageImpl.Literals.STRING_TO_STRING_MAP))); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemItemProvider.java index 008cc53b5be..5d537f644df 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemItemProvider.java @@ -147,27 +147,4 @@ public class RenderedMenuItemItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemProvider.java index c9b7e0ab104..29a0ef2b6ca 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedMenuItemProvider.java @@ -147,28 +147,4 @@ public class RenderedMenuItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedToolBarItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedToolBarItemProvider.java index 90c2c8d712e..c764d558c04 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedToolBarItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/RenderedToolBarItemProvider.java @@ -147,28 +147,4 @@ public class RenderedToolBarItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarContributionItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarContributionItemProvider.java index d3f5d02bd8c..5131faa3f04 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarContributionItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarContributionItemProvider.java @@ -175,30 +175,6 @@ public class ToolBarContributionItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarElementItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarElementItemProvider.java index b28e0a639d0..91c56e45590 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarElementItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarElementItemProvider.java @@ -107,29 +107,6 @@ public class ToolBarElementItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarItemProvider.java index 5aaaabfca5e..1d5c9c1eb91 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarItemProvider.java @@ -118,30 +118,6 @@ public class ToolBarItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarSeparatorItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarSeparatorItemProvider.java index 466d40705f7..891288b3070 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarSeparatorItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolBarSeparatorItemProvider.java @@ -114,27 +114,4 @@ public class ToolBarSeparatorItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolControlItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolControlItemProvider.java index 7b7411acdfc..d7a9aacfd36 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolControlItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolControlItemProvider.java @@ -200,27 +200,4 @@ public class ToolControlItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolItemItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolItemItemProvider.java index 917563bd2a2..5b49e8c2aa3 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolItemItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/ToolItemItemProvider.java @@ -174,28 +174,4 @@ public class ToolItemItemProvider MMenuFactory.INSTANCE.createOpaqueMenu())); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == MenuPackageImpl.Literals.TOOL_ITEM__MENU || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/TrimContributionItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/TrimContributionItemProvider.java index c50a7a437c2..ccd91ad268e 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/TrimContributionItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/menu/provider/TrimContributionItemProvider.java @@ -175,30 +175,6 @@ public class TrimContributionItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/ElementContainerItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/ElementContainerItemProvider.java index fc7313e2f16..1f2baef54ac 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/ElementContainerItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/ElementContainerItemProvider.java @@ -329,28 +329,4 @@ public class ElementContainerItemProvider MAdvancedFactory.INSTANCE.createArea())); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericStackItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericStackItemProvider.java index 6cba89c448b..83851f0af4b 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericStackItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericStackItemProvider.java @@ -103,28 +103,4 @@ public class GenericStackItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTileItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTileItemProvider.java index 319d4b84fbb..578626248e0 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTileItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTileItemProvider.java @@ -135,28 +135,4 @@ public class GenericTileItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTrimContainerItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTrimContainerItemProvider.java index c2eaead0b7d..216e69bfa70 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTrimContainerItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/GenericTrimContainerItemProvider.java @@ -135,28 +135,4 @@ public class GenericTrimContainerItemProvider super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN || - childFeature == UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - } diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/SnippetContainerItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/SnippetContainerItemProvider.java new file mode 100644 index 00000000000..828fa89d4cf --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/SnippetContainerItemProvider.java @@ -0,0 +1,340 @@ +/**
+ * Copyright (c) 2008 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.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.MApplicationFactory;
+
+import org.eclipse.e4.ui.model.application.provider.UIElementsEditPlugin;
+
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+
+import org.eclipse.e4.ui.model.application.ui.advanced.MAdvancedFactory;
+
+import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
+
+import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
+
+import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SnippetContainerItemProvider
+ extends ItemProviderAdapter
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public SnippetContainerItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns SnippetContainer.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/SnippetContainer")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ return getString("_UI_SnippetContainer_type"); //$NON-NLS-1$
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(MSnippetContainer.class)) {
+ case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MApplicationFactory.INSTANCE.createApplication()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createMenuSeparator()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createMenu()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createMenuContribution()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createPopupMenu()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createDirectMenuItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createHandledMenuItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createToolBar()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createToolControl()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createHandledToolItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createDirectToolItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createToolBarSeparator()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createRenderedMenu()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createRenderedToolBar()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createToolBarContribution()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createTrimContribution()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createRenderedMenuItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createOpaqueToolItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createOpaqueMenuItem()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createOpaqueMenuSeparator()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MMenuFactory.INSTANCE.createOpaqueMenu()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createPart()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createInputPart()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createPartStack()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createPartSashContainer()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createWindow()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createTrimmedWindow()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MBasicFactory.INSTANCE.createTrimBar()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MAdvancedFactory.INSTANCE.createPlaceholder()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MAdvancedFactory.INSTANCE.createPerspective()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MAdvancedFactory.INSTANCE.createPerspectiveStack()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS,
+ MAdvancedFactory.INSTANCE.createArea()));
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return UIElementsEditPlugin.INSTANCE;
+ }
+
+}
diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UIElementItemProvider.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UIElementItemProvider.java index 86b30c906a8..bb27662eedb 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UIElementItemProvider.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UIElementItemProvider.java @@ -300,29 +300,6 @@ public class UIElementItemProvider } /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) { - Object childFeature = feature; - Object childObject = child; - - boolean qualify = - childFeature == ApplicationPackageImpl.Literals.APPLICATION_ELEMENT__CLONABLE_SNIPPETS || - childFeature == UiPackageImpl.Literals.UI_ELEMENT__VISIBLE_WHEN; - - if (qualify) { - return getString - ("_UI_CreateChild_text2", //$NON-NLS-1$ - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - /** * Return the resource locator for this item provider's resources. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UiItemProviderAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UiItemProviderAdapterFactory.java index e0144d73d56..8f27caf7c2f 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UiItemProviderAdapterFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench.edit/src/org/eclipse/e4/ui/model/application/ui/provider/UiItemProviderAdapterFactory.java @@ -100,6 +100,29 @@ public class UiItemProviderAdapterFactory extends UiAdapterFactory implements Co } /** + * This keeps track of the one adapter used for all {@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer} instances. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected SnippetContainerItemProvider snippetContainerItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer}. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Adapter createSnippetContainerAdapter() { + if (snippetContainerItemProvider == null) { + snippetContainerItemProvider = new SnippetContainerItemProvider(this); + } + + return snippetContainerItemProvider; + } + + /** * This returns the root adapter factory that contains this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -199,6 +222,7 @@ public class UiItemProviderAdapterFactory extends UiAdapterFactory implements Co */ public void dispose() { if (coreExpressionItemProvider != null) coreExpressionItemProvider.dispose(); + if (snippetContainerItemProvider != null) snippetContainerItemProvider.dispose(); } } 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 3f2181e425c..3bda2ed84f9 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore +++ b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore @@ -1,464 +1,468 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="application" - nsURI="http://www.eclipse.org/ui/2010/UIModel/application" nsPrefix="application"> - <eClassifiers xsi:type="ecore:EDataType" name="IEclipseContext" instanceClassName="org.eclipse.e4.core.contexts.IEclipseContext" - serializable="false"/> - <eClassifiers xsi:type="ecore:EClass" name="StringToStringMap" instanceClassName="java.util.Map$Entry"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Application"> - <eStructuralFeatures xsi:type="ecore:EReference" name="commands" upperBound="-1" - eType="#//commands/Command" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="addons" upperBound="-1" - eType="#//Addon" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1" - eType="#//commands/Category" containment="true"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/basic/Window"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/Context"/> - <eGenericSuperTypes eClassifier="#//commands/HandlerContainer"/> - <eGenericSuperTypes eClassifier="#//commands/BindingTableContainer"/> - <eGenericSuperTypes eClassifier="#//descriptor/basic/PartDescriptorContainer"/> - <eGenericSuperTypes eClassifier="#//commands/Bindings"/> - <eGenericSuperTypes eClassifier="#//ui/menu/MenuContributions"/> - <eGenericSuperTypes eClassifier="#//ui/menu/ToolBarContributions"/> - <eGenericSuperTypes eClassifier="#//ui/menu/TrimContributions"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ApplicationElement" abstract="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="tags" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributorURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="clonableSnippets" upperBound="-1" - eType="#//ApplicationElement" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="transientData" upperBound="-1" - eType="#//StringToObjectMap" transient="true" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Contribution" abstract="true" eSuperTypes="#//ApplicationElement"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="object" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true" derived="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="persistedState" upperBound="-1" - eType="#//StringToStringMap" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Addon" eSuperTypes="#//Contribution"/> - <eClassifiers xsi:type="ecore:EClass" name="StringToObjectMap" instanceClassName="java.util.Map$Entry"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/> - </eClassifiers> - <eSubpackages name="commands" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/commands" - nsPrefix="commands"> - <eClassifiers xsi:type="ecore:EClass" name="BindingTableContainer" abstract="true" - interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="bindingTables" upperBound="-1" - eType="#//commands/BindingTable" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="rootContext" upperBound="-1" - eType="#//commands/BindingContext" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Bindings" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="bindingContexts" upperBound="-1" - eType="#//commands/BindingContext"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="BindingContext" eSuperTypes="#//ApplicationElement"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1" - eType="#//commands/BindingContext" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="BindingTable" eSuperTypes="#//ApplicationElement"> - <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1" - eType="#//commands/KeyBinding" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="bindingContext" lowerBound="1" - eType="#//commands/BindingContext"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Command" eSuperTypes="#//ApplicationElement"> - <eOperations name="getLocalizedCommandName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="commandName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" - eType="#//commands/CommandParameter" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="category" eType="#//commands/Category"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="CommandParameter" eSuperTypes="#//ApplicationElement"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Handler" eSuperTypes="#//Contribution"> - <eStructuralFeatures xsi:type="ecore:EReference" name="command" lowerBound="1" - eType="#//commands/Command"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="HandlerContainer" abstract="true" - interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1" - eType="#//commands/Handler" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="KeyBinding" eSuperTypes="#//ApplicationElement #//commands/KeySequence"> - <eStructuralFeatures xsi:type="ecore:EReference" name="command" lowerBound="1" - eType="#//commands/Command"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" - eType="#//commands/Parameter" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="KeySequence" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="keySequence" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//ApplicationElement"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EDataType" name="ParameterizedCommand" instanceClassName="org.eclipse.core.commands.ParameterizedCommand" - serializable="false"/> - <eClassifiers xsi:type="ecore:EClass" name="Category" eSuperTypes="#//ApplicationElement"> - <eOperations name="getLocalizedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - </eSubpackages> - <eSubpackages name="ui" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui" - nsPrefix="ui"> - <eClassifiers xsi:type="ecore:EClass" name="Context" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="context" eType="#//IEclipseContext" - transient="true" derived="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="variables" ordered="false" - upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1" - eType="#//StringToStringMap" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Dirtyable" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="dirty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - transient="true" derived="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Input" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="UIElement" abstract="true" eSuperTypes="#//ApplicationElement"> - <eOperations name="getLocalizedAccessibilityPhrase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="widget" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true" derived="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="renderer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true" derived="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="toBeRendered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="onTop" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eOpposite="#//ui/ElementContainer/children"> - <eGenericType eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/UIElement"/> - </eGenericType> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="curSharedRef" eType="#//ui/advanced/Placeholder" - transient="true" derived="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="visibleWhen" eType="#//ui/Expression" - containment="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessibilityPhrase" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="UILabel" abstract="true" interface="true"> - <eOperations name="getLocalizedLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eOperations name="getLocalizedTooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="tooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ElementContainer" abstract="true" - eSuperTypes="#//ui/UIElement"> - <eTypeParameters name="T"> - <eBounds eClassifier="#//ui/UIElement"/> - </eTypeParameters> - <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1" - containment="true" eOpposite="#//ui/UIElement/parent"> - <eGenericType eTypeParameter="#//ui/ElementContainer/T"/> - </eStructuralFeatures> - <eStructuralFeatures xsi:type="ecore:EReference" name="selectedElement"> - <eGenericType eTypeParameter="#//ui/ElementContainer/T"/> - </eStructuralFeatures> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="GenericStack" abstract="true"> - <eTypeParameters name="T"> - <eBounds eClassifier="#//ui/UIElement"/> - </eTypeParameters> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eTypeParameter="#//ui/GenericStack/T"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="GenericTile" abstract="true"> - <eTypeParameters name="T"> - <eBounds eClassifier="#//ui/UIElement"/> - </eTypeParameters> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eTypeParameter="#//ui/GenericTile/T"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="GenericTrimContainer" abstract="true"> - <eTypeParameters name="T"> - <eBounds eClassifier="#//ui/UIElement"/> - </eTypeParameters> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="side" lowerBound="1" - eType="#//ui/SideValue"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eTypeParameter="#//ui/GenericTrimContainer/T"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EEnum" name="SideValue"> - <eLiterals name="Top"/> - <eLiterals name="Bottom" value="1"/> - <eLiterals name="Left" value="2"/> - <eLiterals name="Right" value="3"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="#//ApplicationElement"/> - <eClassifiers xsi:type="ecore:EClass" name="CoreExpression" eSuperTypes="#//ui/Expression"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="coreExpressionId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - defaultValueLiteral=""/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="coreExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eSubpackages name="menu" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" - nsPrefix="menu"> - <eClassifiers xsi:type="ecore:EEnum" name="ItemType"> - <eLiterals name="Push"/> - <eLiterals name="Check" value="1"/> - <eLiterals name="Radio" value="2"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Item" abstract="true" eSuperTypes="#//ui/UIElement #//ui/UILabel"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="selected" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" - eType="#//ui/menu/ItemType"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="HandledItem" abstract="true" eSuperTypes="#//ui/menu/Item"> - <eStructuralFeatures xsi:type="ecore:EReference" name="command" eType="#//commands/Command"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="wbCommand" eType="#//commands/ParameterizedCommand" - transient="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" - eType="#//commands/Parameter" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MenuElement" abstract="true" eSuperTypes="#//ui/UIElement #//ui/UILabel"> - <eOperations name="getLocalizedMnemonics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="mnemonics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MenuItem" abstract="true" eSuperTypes="#//ui/menu/Item #//ui/menu/MenuElement"/> - <eClassifiers xsi:type="ecore:EClass" name="MenuSeparator" eSuperTypes="#//ui/menu/MenuElement"/> - <eClassifiers xsi:type="ecore:EClass" name="Menu"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="true"/> - <eGenericSuperTypes eClassifier="#//ui/menu/MenuElement"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/menu/MenuElement"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MenuContribution"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="positionInParent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" - defaultValueLiteral=""/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" lowerBound="1" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/menu/MenuElement"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="PopupMenu" eSuperTypes="#//ui/menu/Menu #//ui/Context"/> - <eClassifiers xsi:type="ecore:EClass" name="DirectMenuItem" eSuperTypes="#//ui/menu/MenuItem #//Contribution"/> - <eClassifiers xsi:type="ecore:EClass" name="HandledMenuItem" eSuperTypes="#//ui/menu/MenuItem #//ui/menu/HandledItem"/> - <eClassifiers xsi:type="ecore:EClass" name="ToolItem" abstract="true" eSuperTypes="#//ui/menu/Item #//ui/menu/ToolBarElement"> - <eStructuralFeatures xsi:type="ecore:EReference" name="menu" eType="#//ui/menu/Menu" - containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ToolBar"> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/menu/ToolBarElement"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/basic/TrimElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ToolBarElement" abstract="true" - eSuperTypes="#//ui/UIElement"/> - <eClassifiers xsi:type="ecore:EClass" name="ToolControl" eSuperTypes="#//ui/menu/ToolBarElement #//Contribution #//ui/basic/TrimElement"/> - <eClassifiers xsi:type="ecore:EClass" name="HandledToolItem" eSuperTypes="#//ui/menu/ToolItem #//ui/menu/HandledItem"/> - <eClassifiers xsi:type="ecore:EClass" name="DirectToolItem" eSuperTypes="#//ui/menu/ToolItem #//Contribution"/> - <eClassifiers xsi:type="ecore:EClass" name="ToolBarSeparator" eSuperTypes="#//ui/menu/ToolBarElement"/> - <eClassifiers xsi:type="ecore:EClass" name="MenuContributions" abstract="true" - interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="menuContributions" - upperBound="-1" eType="#//ui/menu/MenuContribution" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RenderedMenu" eSuperTypes="#//ui/menu/Menu"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionManager" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RenderedToolBar" eSuperTypes="#//ui/menu/ToolBar"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionManager" - eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ToolBarContribution"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="positionInParent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/menu/ToolBarElement"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ToolBarContributions" abstract="true" - interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="toolBarContributions" - upperBound="-1" eType="#//ui/menu/ToolBarContribution" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TrimContribution"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="positionInParent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/basic/TrimElement"/> - </eGenericSuperTypes> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TrimContributions" abstract="true" - interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="trimContributions" - upperBound="-1" eType="#//ui/menu/TrimContribution" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RenderedMenuItem" eSuperTypes="#//ui/menu/MenuItem"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="OpaqueToolItem" eSuperTypes="#//ui/menu/ToolItem"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenuItem" eSuperTypes="#//ui/menu/MenuItem"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenuSeparator" eSuperTypes="#//ui/menu/MenuSeparator"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject" - transient="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenu" eSuperTypes="#//ui/menu/Menu"/> - </eSubpackages> - <eSubpackages name="basic" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" - nsPrefix="basic"> - <eClassifiers xsi:type="ecore:EClass" name="Part" eSuperTypes="#//ui/UIElement #//ui/basic/PartSashContainerElement #//ui/basic/StackElement #//Contribution #//ui/Context #//ui/UILabel #//commands/HandlerContainer #//ui/Dirtyable #//commands/Bindings #//ui/basic/WindowElement"> - <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="menus" upperBound="-1" - eType="#//ui/menu/Menu" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="toolbar" eType="#//ui/menu/ToolBar" - containment="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="closeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="false"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="InputPart" eSuperTypes="#//ui/basic/Part #//ui/Input"/> - <eClassifiers xsi:type="ecore:EClass" name="PartStack"> - <eGenericSuperTypes eClassifier="#//ui/GenericStack"> - <eTypeArguments eClassifier="#//ui/basic/StackElement"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/basic/PartSashContainerElement"/> - <eGenericSuperTypes eClassifier="#//ui/basic/WindowElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="PartSashContainer"> - <eGenericSuperTypes eClassifier="#//ui/GenericTile"> - <eTypeArguments eClassifier="#//ui/basic/PartSashContainerElement"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/basic/PartSashContainerElement"/> - <eGenericSuperTypes eClassifier="#//ui/basic/WindowElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Window"> - <eStructuralFeatures xsi:type="ecore:EReference" name="mainMenu" eType="#//ui/menu/Menu" - containment="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="windows" upperBound="-1" - eType="#//ui/basic/Window" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="sharedElements" upperBound="-1" - eType="#//ui/UIElement" containment="true"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/basic/WindowElement"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/UILabel"/> - <eGenericSuperTypes eClassifier="#//ui/Context"/> - <eGenericSuperTypes eClassifier="#//commands/HandlerContainer"/> - <eGenericSuperTypes eClassifier="#//commands/Bindings"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TrimmedWindow" eSuperTypes="#//ui/basic/Window"> - <eStructuralFeatures xsi:type="ecore:EReference" name="trimBars" upperBound="-1" - eType="#//ui/basic/TrimBar" containment="true"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TrimElement" abstract="true" eSuperTypes="#//ui/UIElement"/> - <eClassifiers xsi:type="ecore:EClass" name="PartSashContainerElement" abstract="true" - interface="true" eSuperTypes="#//ui/UIElement"/> - <eClassifiers xsi:type="ecore:EClass" name="WindowElement" abstract="true" interface="true" - eSuperTypes="#//ui/UIElement"/> - <eClassifiers xsi:type="ecore:EClass" name="TrimBar"> - <eGenericSuperTypes eClassifier="#//ui/GenericTrimContainer"> - <eTypeArguments eClassifier="#//ui/basic/TrimElement"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/UIElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="StackElement" abstract="true" interface="true" - eSuperTypes="#//ui/UIElement"/> - </eSubpackages> - <eSubpackages name="advanced" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced" - nsPrefix="advanced"> - <eClassifiers xsi:type="ecore:EClass" name="Placeholder" eSuperTypes="#//ui/UIElement #//ui/basic/PartSashContainerElement #//ui/basic/StackElement"> - <eStructuralFeatures xsi:type="ecore:EReference" name="ref" lowerBound="1" - eType="#//ui/UIElement"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="closeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="false"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Perspective"> - <eStructuralFeatures xsi:type="ecore:EReference" name="windows" upperBound="-1" - eType="#//ui/basic/Window" containment="true"/> - <eGenericSuperTypes eClassifier="#//ui/ElementContainer"> - <eTypeArguments eClassifier="#//ui/basic/PartSashContainerElement"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/UILabel"/> - <eGenericSuperTypes eClassifier="#//ui/Context"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="PerspectiveStack"> - <eGenericSuperTypes eClassifier="#//ui/UIElement"/> - <eGenericSuperTypes eClassifier="#//ui/GenericStack"> - <eTypeArguments eClassifier="#//ui/advanced/Perspective"/> - </eGenericSuperTypes> - <eGenericSuperTypes eClassifier="#//ui/basic/PartSashContainerElement"/> - <eGenericSuperTypes eClassifier="#//ui/basic/WindowElement"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Area" eSuperTypes="#//ui/basic/PartSashContainer #//ui/UILabel"/> - </eSubpackages> - </eSubpackages> - <eSubpackages name="descriptor" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/descriptor" - nsPrefix="descriptor"> - <eSubpackages name="basic" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" - nsPrefix="basic"> - <eClassifiers xsi:type="ecore:EClass" name="PartDescriptor" eSuperTypes="#//ApplicationElement #//ui/UILabel #//commands/HandlerContainer #//commands/Bindings"> - <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowMultiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="menus" upperBound="-1" - eType="#//ui/menu/Menu" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="toolbar" eType="#//ui/menu/ToolBar" - containment="true"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="closeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" - defaultValueLiteral="false"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="dirtyable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="PartDescriptorContainer" abstract="true" - interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="descriptors" upperBound="-1" - eType="#//descriptor/basic/PartDescriptor" containment="true"/> - </eClassifiers> - </eSubpackages> - </eSubpackages> -</ecore:EPackage> +<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="application"
+ nsURI="http://www.eclipse.org/ui/2010/UIModel/application" nsPrefix="application">
+ <eClassifiers xsi:type="ecore:EDataType" name="IEclipseContext" instanceClassName="org.eclipse.e4.core.contexts.IEclipseContext"
+ serializable="false"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StringToStringMap" instanceClassName="java.util.Map$Entry">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Application">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="commands" upperBound="-1"
+ eType="#//commands/Command" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="addons" upperBound="-1"
+ eType="#//Addon" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="categories" upperBound="-1"
+ eType="#//commands/Category" containment="true"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/basic/Window"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/Context"/>
+ <eGenericSuperTypes eClassifier="#//commands/HandlerContainer"/>
+ <eGenericSuperTypes eClassifier="#//commands/BindingTableContainer"/>
+ <eGenericSuperTypes eClassifier="#//descriptor/basic/PartDescriptorContainer"/>
+ <eGenericSuperTypes eClassifier="#//commands/Bindings"/>
+ <eGenericSuperTypes eClassifier="#//ui/menu/MenuContributions"/>
+ <eGenericSuperTypes eClassifier="#//ui/menu/ToolBarContributions"/>
+ <eGenericSuperTypes eClassifier="#//ui/menu/TrimContributions"/>
+ <eGenericSuperTypes eClassifier="#//ui/SnippetContainer"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ApplicationElement" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="tags" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributorURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="transientData" upperBound="-1"
+ eType="#//StringToObjectMap" transient="true" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Contribution" abstract="true" eSuperTypes="#//ApplicationElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="object" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="persistedState" upperBound="-1"
+ eType="#//StringToStringMap" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Addon" eSuperTypes="#//Contribution"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StringToObjectMap" instanceClassName="java.util.Map$Entry">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eClassifiers>
+ <eSubpackages name="commands" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/commands"
+ nsPrefix="commands">
+ <eClassifiers xsi:type="ecore:EClass" name="BindingTableContainer" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bindingTables" upperBound="-1"
+ eType="#//commands/BindingTable" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rootContext" upperBound="-1"
+ eType="#//commands/BindingContext" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Bindings" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bindingContexts" upperBound="-1"
+ eType="#//commands/BindingContext"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BindingContext" eSuperTypes="#//ApplicationElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//commands/BindingContext" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BindingTable" eSuperTypes="#//ApplicationElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bindings" upperBound="-1"
+ eType="#//commands/KeyBinding" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bindingContext" lowerBound="1"
+ eType="#//commands/BindingContext"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Command" eSuperTypes="#//ApplicationElement">
+ <eOperations name="getLocalizedCommandName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="commandName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+ eType="#//commands/CommandParameter" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="category" eType="#//commands/Category"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CommandParameter" eSuperTypes="#//ApplicationElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Handler" eSuperTypes="#//Contribution">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="command" lowerBound="1"
+ eType="#//commands/Command"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="HandlerContainer" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
+ eType="#//commands/Handler" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="KeyBinding" eSuperTypes="#//ApplicationElement #//commands/KeySequence">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="command" lowerBound="1"
+ eType="#//commands/Command"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+ eType="#//commands/Parameter" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="KeySequence" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="keySequence" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//ApplicationElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="ParameterizedCommand" instanceClassName="org.eclipse.core.commands.ParameterizedCommand"
+ serializable="false"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Category" eSuperTypes="#//ApplicationElement">
+ <eOperations name="getLocalizedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ </eSubpackages>
+ <eSubpackages name="ui" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui"
+ nsPrefix="ui">
+ <eClassifiers xsi:type="ecore:EClass" name="Context" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="context" eType="#//IEclipseContext"
+ transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="variables" ordered="false"
+ upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
+ eType="#//StringToStringMap" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Dirtyable" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dirty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ transient="true" derived="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Input" abstract="true" interface="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="inputURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="UIElement" abstract="true" eSuperTypes="#//ApplicationElement">
+ <eOperations name="getLocalizedAccessibilityPhrase" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="widget" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="renderer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="toBeRendered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="onTop" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eOpposite="#//ui/ElementContainer/children">
+ <eGenericType eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/UIElement"/>
+ </eGenericType>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="containerData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="curSharedRef" eType="#//ui/advanced/Placeholder"
+ transient="true" derived="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="visibleWhen" eType="#//ui/Expression"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessibilityPhrase"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ElementContainer" abstract="true"
+ eSuperTypes="#//ui/UIElement">
+ <eTypeParameters name="T">
+ <eBounds eClassifier="#//ui/UIElement"/>
+ </eTypeParameters>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ containment="true" eOpposite="#//ui/UIElement/parent">
+ <eGenericType eTypeParameter="#//ui/ElementContainer/T"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="selectedElement">
+ <eGenericType eTypeParameter="#//ui/ElementContainer/T"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="UILabel" abstract="true" interface="true">
+ <eOperations name="getLocalizedLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="getLocalizedTooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="tooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenericStack" abstract="true">
+ <eTypeParameters name="T">
+ <eBounds eClassifier="#//ui/UIElement"/>
+ </eTypeParameters>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eTypeParameter="#//ui/GenericStack/T"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenericTile" abstract="true">
+ <eTypeParameters name="T">
+ <eBounds eClassifier="#//ui/UIElement"/>
+ </eTypeParameters>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontal" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eTypeParameter="#//ui/GenericTile/T"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenericTrimContainer" abstract="true">
+ <eTypeParameters name="T">
+ <eBounds eClassifier="#//ui/UIElement"/>
+ </eTypeParameters>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="side" lowerBound="1"
+ eType="#//ui/SideValue"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eTypeParameter="#//ui/GenericTrimContainer/T"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="SideValue">
+ <eLiterals name="Top"/>
+ <eLiterals name="Bottom" value="1"/>
+ <eLiterals name="Left" value="2"/>
+ <eLiterals name="Right" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="#//ApplicationElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="CoreExpression" eSuperTypes="#//ui/Expression">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="coreExpressionId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral=""/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="coreExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SnippetContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="snippets" upperBound="-1"
+ eType="#//ui/UIElement" containment="true"/>
+ </eClassifiers>
+ <eSubpackages name="menu" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu"
+ nsPrefix="menu">
+ <eClassifiers xsi:type="ecore:EEnum" name="ItemType">
+ <eLiterals name="Push"/>
+ <eLiterals name="Check" value="1"/>
+ <eLiterals name="Radio" value="2"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Item" abstract="true" eSuperTypes="#//ui/UIElement #//ui/UILabel">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="selected" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1"
+ eType="#//ui/menu/ItemType"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="HandledItem" abstract="true" eSuperTypes="#//ui/menu/Item">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="command" eType="#//commands/Command"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="wbCommand" eType="#//commands/ParameterizedCommand"
+ transient="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
+ eType="#//commands/Parameter" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MenuElement" abstract="true" eSuperTypes="#//ui/UIElement #//ui/UILabel">
+ <eOperations name="getLocalizedMnemonics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="mnemonics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MenuItem" abstract="true" eSuperTypes="#//ui/menu/Item #//ui/menu/MenuElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="MenuSeparator" eSuperTypes="#//ui/menu/MenuElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Menu">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
+ <eGenericSuperTypes eClassifier="#//ui/menu/MenuElement"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/menu/MenuElement"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MenuContribution">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="positionInParent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral=""/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/menu/MenuElement"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PopupMenu" eSuperTypes="#//ui/menu/Menu #//ui/Context"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DirectMenuItem" eSuperTypes="#//ui/menu/MenuItem #//Contribution"/>
+ <eClassifiers xsi:type="ecore:EClass" name="HandledMenuItem" eSuperTypes="#//ui/menu/MenuItem #//ui/menu/HandledItem"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolItem" abstract="true" eSuperTypes="#//ui/menu/Item #//ui/menu/ToolBarElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="menu" eType="#//ui/menu/Menu"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolBar">
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/menu/ToolBarElement"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/basic/TrimElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolBarElement" abstract="true"
+ eSuperTypes="#//ui/UIElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolControl" eSuperTypes="#//ui/menu/ToolBarElement #//Contribution #//ui/basic/TrimElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="HandledToolItem" eSuperTypes="#//ui/menu/ToolItem #//ui/menu/HandledItem"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DirectToolItem" eSuperTypes="#//ui/menu/ToolItem #//Contribution"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolBarSeparator" eSuperTypes="#//ui/menu/ToolBarElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="MenuContributions" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="menuContributions"
+ upperBound="-1" eType="#//ui/menu/MenuContribution" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RenderedMenu" eSuperTypes="#//ui/menu/Menu">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionManager"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RenderedToolBar" eSuperTypes="#//ui/menu/ToolBar">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionManager"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolBarContribution">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="positionInParent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/menu/ToolBarElement"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolBarContributions" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toolBarContributions"
+ upperBound="-1" eType="#//ui/menu/ToolBarContribution" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TrimContribution">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="positionInParent" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/basic/TrimElement"/>
+ </eGenericSuperTypes>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TrimContributions" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="trimContributions"
+ upperBound="-1" eType="#//ui/menu/TrimContribution" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RenderedMenuItem" eSuperTypes="#//ui/menu/MenuItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OpaqueToolItem" eSuperTypes="#//ui/menu/ToolItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenuItem" eSuperTypes="#//ui/menu/MenuItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenuSeparator" eSuperTypes="#//ui/menu/MenuSeparator">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="opaqueItem" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
+ transient="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OpaqueMenu" eSuperTypes="#//ui/menu/Menu"/>
+ </eSubpackages>
+ <eSubpackages name="basic" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic"
+ nsPrefix="basic">
+ <eClassifiers xsi:type="ecore:EClass" name="Part" eSuperTypes="#//ui/UIElement #//ui/basic/PartSashContainerElement #//ui/basic/StackElement #//Contribution #//ui/Context #//ui/UILabel #//commands/HandlerContainer #//ui/Dirtyable #//commands/Bindings #//ui/basic/WindowElement">
+ <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="menus" upperBound="-1"
+ eType="#//ui/menu/Menu" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toolbar" eType="#//ui/menu/ToolBar"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="closeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="InputPart" eSuperTypes="#//ui/basic/Part #//ui/Input"/>
+ <eClassifiers xsi:type="ecore:EClass" name="PartStack">
+ <eGenericSuperTypes eClassifier="#//ui/GenericStack">
+ <eTypeArguments eClassifier="#//ui/basic/StackElement"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/basic/PartSashContainerElement"/>
+ <eGenericSuperTypes eClassifier="#//ui/basic/WindowElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartSashContainer">
+ <eGenericSuperTypes eClassifier="#//ui/GenericTile">
+ <eTypeArguments eClassifier="#//ui/basic/PartSashContainerElement"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/basic/PartSashContainerElement"/>
+ <eGenericSuperTypes eClassifier="#//ui/basic/WindowElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Window">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mainMenu" eType="#//ui/menu/Menu"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="windows" upperBound="-1"
+ eType="#//ui/basic/Window" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sharedElements" upperBound="-1"
+ eType="#//ui/UIElement" containment="true"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/basic/WindowElement"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/UILabel"/>
+ <eGenericSuperTypes eClassifier="#//ui/Context"/>
+ <eGenericSuperTypes eClassifier="#//commands/HandlerContainer"/>
+ <eGenericSuperTypes eClassifier="#//commands/Bindings"/>
+ <eGenericSuperTypes eClassifier="#//ui/SnippetContainer"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TrimmedWindow" eSuperTypes="#//ui/basic/Window">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="trimBars" upperBound="-1"
+ eType="#//ui/basic/TrimBar" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TrimElement" abstract="true" eSuperTypes="#//ui/UIElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="PartSashContainerElement" abstract="true"
+ interface="true" eSuperTypes="#//ui/UIElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="WindowElement" abstract="true" interface="true"
+ eSuperTypes="#//ui/UIElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="TrimBar">
+ <eGenericSuperTypes eClassifier="#//ui/GenericTrimContainer">
+ <eTypeArguments eClassifier="#//ui/basic/TrimElement"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/UIElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StackElement" abstract="true" interface="true"
+ eSuperTypes="#//ui/UIElement"/>
+ </eSubpackages>
+ <eSubpackages name="advanced" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced"
+ nsPrefix="advanced">
+ <eClassifiers xsi:type="ecore:EClass" name="Placeholder" eSuperTypes="#//ui/UIElement #//ui/basic/PartSashContainerElement #//ui/basic/StackElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ref" lowerBound="1"
+ eType="#//ui/UIElement"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="closeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Perspective">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="windows" upperBound="-1"
+ eType="#//ui/basic/Window" containment="true"/>
+ <eGenericSuperTypes eClassifier="#//ui/ElementContainer">
+ <eTypeArguments eClassifier="#//ui/basic/PartSashContainerElement"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/UILabel"/>
+ <eGenericSuperTypes eClassifier="#//ui/Context"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PerspectiveStack">
+ <eGenericSuperTypes eClassifier="#//ui/UIElement"/>
+ <eGenericSuperTypes eClassifier="#//ui/GenericStack">
+ <eTypeArguments eClassifier="#//ui/advanced/Perspective"/>
+ </eGenericSuperTypes>
+ <eGenericSuperTypes eClassifier="#//ui/basic/PartSashContainerElement"/>
+ <eGenericSuperTypes eClassifier="#//ui/basic/WindowElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Area" eSuperTypes="#//ui/basic/PartSashContainer #//ui/UILabel"/>
+ </eSubpackages>
+ </eSubpackages>
+ <eSubpackages name="descriptor" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/descriptor"
+ nsPrefix="descriptor">
+ <eSubpackages name="basic" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic"
+ nsPrefix="basic">
+ <eClassifiers xsi:type="ecore:EClass" name="PartDescriptor" eSuperTypes="#//ApplicationElement #//ui/UILabel #//commands/HandlerContainer #//commands/Bindings">
+ <eOperations name="getLocalizedDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="allowMultiple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="menus" upperBound="-1"
+ eType="#//ui/menu/Menu" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="toolbar" eType="#//ui/menu/ToolBar"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="closeable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dirtyable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="contributionURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PartDescriptorContainer" abstract="true"
+ interface="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="descriptors" upperBound="-1"
+ eType="#//descriptor/basic/PartDescriptor" containment="true"/>
+ </eClassifiers>
+ </eSubpackages>
+ </eSubpackages>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java index e10cb7508e4..7ce48cbafa3 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java @@ -19,6 +19,7 @@ import org.eclipse.e4.ui.model.application.commands.MHandlerContainer; import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer; import org.eclipse.e4.ui.model.application.ui.MContext; import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions; import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions; @@ -41,7 +42,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions; * @model * @generated */ -public interface MApplication extends MElementContainer<MWindow>, MContext, MHandlerContainer, MBindingTableContainer, MPartDescriptorContainer, MBindings, MMenuContributions, MToolBarContributions, MTrimContributions { +public interface MApplication extends MElementContainer<MWindow>, MContext, MHandlerContainer, MBindingTableContainer, MPartDescriptorContainer, MBindings, MMenuContributions, MToolBarContributions, MTrimContributions, MSnippetContainer { /** * Returns the value of the '<em><b>Commands</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.e4.ui.model.application.commands.MCommand}. diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplicationElement.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplicationElement.java index 4cea5e5099a..9edbd9a825f 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplicationElement.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplicationElement.java @@ -24,7 +24,6 @@ import java.util.Map; * <li>{@link org.eclipse.e4.ui.model.application.MApplicationElement#getElementId <em>Element Id</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.MApplicationElement#getTags <em>Tags</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.MApplicationElement#getContributorURI <em>Contributor URI</em>}</li> - * <li>{@link org.eclipse.e4.ui.model.application.MApplicationElement#getClonableSnippets <em>Clonable Snippets</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.MApplicationElement#getTransientData <em>Transient Data</em>}</li> * </ul> * </p> @@ -114,19 +113,4 @@ public interface MApplicationElement { */ Map<String, Object> getTransientData(); - /** - * Returns the value of the '<em><b>Clonable Snippets</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.e4.ui.model.application.MApplicationElement}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Clonable Snippets</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Clonable Snippets</em>' containment reference list. - * @model containment="true" - * @generated - */ - List<MApplicationElement> getClonableSnippets(); - } // MApplicationElement diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/impl/CommandsPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/impl/CommandsPackageImpl.java index 2751b0c9594..0e24902106b 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/impl/CommandsPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/commands/impl/CommandsPackageImpl.java @@ -207,15 +207,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int BINDING_CONTEXT__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int BINDING_CONTEXT__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -307,15 +298,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int BINDING_TABLE__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int BINDING_TABLE__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -398,15 +380,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int COMMAND__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int COMMAND__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -525,15 +498,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int COMMAND_PARAMETER__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int COMMAND_PARAMETER__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -625,15 +589,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int HANDLER__CONTRIBUTOR_URI = ApplicationPackageImpl.CONTRIBUTION__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int HANDLER__CLONABLE_SNIPPETS = ApplicationPackageImpl.CONTRIBUTION__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -781,15 +736,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int KEY_BINDING__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int KEY_BINDING__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -908,15 +854,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int PARAMETER__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PARAMETER__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -999,15 +936,6 @@ public class CommandsPackageImpl extends EPackageImpl { public static final int CATEGORY__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int CATEGORY__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl.java index e0b2bee9e26..025130cffc8 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl.java @@ -112,15 +112,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int PART_DESCRIPTOR__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PART_DESCRIPTOR__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java index 0497e355dc3..5f4d0074e24 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java @@ -38,7 +38,6 @@ import org.eclipse.emf.ecore.util.InternalEList; * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl#getElementId <em>Element Id</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl#getTags <em>Tags</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl#getContributorURI <em>Contributor URI</em>}</li> - * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl#getClonableSnippets <em>Clonable Snippets</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl#getTransientData <em>Transient Data</em>}</li> * </ul> * </p> @@ -97,16 +96,6 @@ public abstract class ApplicationElementImpl extends Container implements MAppli protected String contributorURI = CONTRIBUTOR_URI_EDEFAULT; /** - * The cached value of the '{@link #getClonableSnippets() <em>Clonable Snippets</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getClonableSnippets() - * @generated - * @ordered - */ - protected EList<MApplicationElement> clonableSnippets; - - /** * The cached value of the '{@link #getTransientData() <em>Transient Data</em>}' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -205,23 +194,9 @@ public abstract class ApplicationElementImpl extends Container implements MAppli * <!-- end-user-doc --> * @generated */ - public List<MApplicationElement> getClonableSnippets() { - if (clonableSnippets == null) { - clonableSnippets = new EObjectContainmentEList<MApplicationElement>(MApplicationElement.class, this, ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS); - } - return clonableSnippets; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { - case ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS: - return ((InternalEList<?>)getClonableSnippets()).basicRemove(otherEnd, msgs); case ApplicationPackageImpl.APPLICATION_ELEMENT__TRANSIENT_DATA: return ((InternalEList<?>)((EMap.InternalMapView<String, Object>)getTransientData()).eMap()).basicRemove(otherEnd, msgs); } @@ -242,8 +217,6 @@ public abstract class ApplicationElementImpl extends Container implements MAppli return getTags(); case ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI: return getContributorURI(); - case ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS: - return getClonableSnippets(); case ApplicationPackageImpl.APPLICATION_ELEMENT__TRANSIENT_DATA: if (coreType) return ((EMap.InternalMapView<String, Object>)getTransientData()).eMap(); else return getTransientData(); @@ -270,10 +243,6 @@ public abstract class ApplicationElementImpl extends Container implements MAppli case ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI: setContributorURI((String)newValue); return; - case ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS: - getClonableSnippets().clear(); - getClonableSnippets().addAll((Collection<? extends MApplicationElement>)newValue); - return; case ApplicationPackageImpl.APPLICATION_ELEMENT__TRANSIENT_DATA: ((EStructuralFeature.Setting)((EMap.InternalMapView<String, Object>)getTransientData()).eMap()).set(newValue); return; @@ -298,9 +267,6 @@ public abstract class ApplicationElementImpl extends Container implements MAppli case ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI: setContributorURI(CONTRIBUTOR_URI_EDEFAULT); return; - case ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS: - getClonableSnippets().clear(); - return; case ApplicationPackageImpl.APPLICATION_ELEMENT__TRANSIENT_DATA: getTransientData().clear(); return; @@ -322,8 +288,6 @@ public abstract class ApplicationElementImpl extends Container implements MAppli return tags != null && !tags.isEmpty(); case ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI: return CONTRIBUTOR_URI_EDEFAULT == null ? contributorURI != null : !CONTRIBUTOR_URI_EDEFAULT.equals(contributorURI); - case ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS: - return clonableSnippets != null && !clonableSnippets.isEmpty(); case ApplicationPackageImpl.APPLICATION_ELEMENT__TRANSIENT_DATA: return transientData != null && !transientData.isEmpty(); } diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java index e1b55847b3b..29213525bd8 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java @@ -29,6 +29,8 @@ import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor; import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer; import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImpl; import org.eclipse.e4.ui.model.application.ui.MContext; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; +import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; import org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl; import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; @@ -71,6 +73,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getMenuContributions <em>Menu Contributions</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getToolBarContributions <em>Tool Bar Contributions</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getTrimContributions <em>Trim Contributions</em>}</li> + * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getSnippets <em>Snippets</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getCommands <em>Commands</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getAddons <em>Addons</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getCategories <em>Categories</em>}</li> @@ -201,6 +204,16 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA protected EList<MTrimContribution> trimContributions; /** + * The cached value of the '{@link #getSnippets() <em>Snippets</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSnippets() + * @generated + * @ordered + */ + protected EList<MUIElement> snippets; + + /** * The cached value of the '{@link #getCommands() <em>Commands</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -395,6 +408,18 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA * <!-- end-user-doc --> * @generated */ + public List<MUIElement> getSnippets() { + if (snippets == null) { + snippets = new EObjectContainmentEList<MUIElement>(MUIElement.class, this, ApplicationPackageImpl.APPLICATION__SNIPPETS); + } + return snippets; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public List<MCommand> getCommands() { if (commands == null) { commands = new EObjectContainmentEList<MCommand>(MCommand.class, this, ApplicationPackageImpl.APPLICATION__COMMANDS); @@ -450,6 +475,8 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA return ((InternalEList<?>)getToolBarContributions()).basicRemove(otherEnd, msgs); case ApplicationPackageImpl.APPLICATION__TRIM_CONTRIBUTIONS: return ((InternalEList<?>)getTrimContributions()).basicRemove(otherEnd, msgs); + case ApplicationPackageImpl.APPLICATION__SNIPPETS: + return ((InternalEList<?>)getSnippets()).basicRemove(otherEnd, msgs); case ApplicationPackageImpl.APPLICATION__COMMANDS: return ((InternalEList<?>)getCommands()).basicRemove(otherEnd, msgs); case ApplicationPackageImpl.APPLICATION__ADDONS: @@ -491,6 +518,8 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA return getToolBarContributions(); case ApplicationPackageImpl.APPLICATION__TRIM_CONTRIBUTIONS: return getTrimContributions(); + case ApplicationPackageImpl.APPLICATION__SNIPPETS: + return getSnippets(); case ApplicationPackageImpl.APPLICATION__COMMANDS: return getCommands(); case ApplicationPackageImpl.APPLICATION__ADDONS: @@ -552,6 +581,10 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA getTrimContributions().clear(); getTrimContributions().addAll((Collection<? extends MTrimContribution>)newValue); return; + case ApplicationPackageImpl.APPLICATION__SNIPPETS: + getSnippets().clear(); + getSnippets().addAll((Collection<? extends MUIElement>)newValue); + return; case ApplicationPackageImpl.APPLICATION__COMMANDS: getCommands().clear(); getCommands().addAll((Collection<? extends MCommand>)newValue); @@ -609,6 +642,9 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA case ApplicationPackageImpl.APPLICATION__TRIM_CONTRIBUTIONS: getTrimContributions().clear(); return; + case ApplicationPackageImpl.APPLICATION__SNIPPETS: + getSnippets().clear(); + return; case ApplicationPackageImpl.APPLICATION__COMMANDS: getCommands().clear(); return; @@ -652,6 +688,8 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA return toolBarContributions != null && !toolBarContributions.isEmpty(); case ApplicationPackageImpl.APPLICATION__TRIM_CONTRIBUTIONS: return trimContributions != null && !trimContributions.isEmpty(); + case ApplicationPackageImpl.APPLICATION__SNIPPETS: + return snippets != null && !snippets.isEmpty(); case ApplicationPackageImpl.APPLICATION__COMMANDS: return commands != null && !commands.isEmpty(); case ApplicationPackageImpl.APPLICATION__ADDONS: @@ -720,6 +758,12 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA default: return -1; } } + if (baseClass == MSnippetContainer.class) { + switch (derivedFeatureID) { + case ApplicationPackageImpl.APPLICATION__SNIPPETS: return UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS; + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -781,6 +825,12 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA default: return -1; } } + if (baseClass == MSnippetContainer.class) { + switch (baseFeatureID) { + case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS: return ApplicationPackageImpl.APPLICATION__SNIPPETS; + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java index 347a15277c1..cf9996c54c1 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java @@ -163,22 +163,13 @@ public class ApplicationPackageImpl extends EPackageImpl { public static final int APPLICATION_ELEMENT__CONTRIBUTOR_URI = 2; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int APPLICATION_ELEMENT__CLONABLE_SNIPPETS = 3; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int APPLICATION_ELEMENT__TRANSIENT_DATA = 4; + public static final int APPLICATION_ELEMENT__TRANSIENT_DATA = 3; /** * The number of structural features of the '<em>Element</em>' class. @@ -187,7 +178,7 @@ public class ApplicationPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int APPLICATION_ELEMENT_FEATURE_COUNT = 5; + public static final int APPLICATION_ELEMENT_FEATURE_COUNT = 4; /** * The number of operations of the '<em>Element</em>' class. @@ -236,15 +227,6 @@ public class ApplicationPackageImpl extends EPackageImpl { public static final int APPLICATION__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int APPLICATION__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -461,13 +443,22 @@ public class ApplicationPackageImpl extends EPackageImpl { public static final int APPLICATION__TRIM_CONTRIBUTIONS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10; /** + * The feature id for the '<em><b>Snippets</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int APPLICATION__SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11; + + /** * The feature id for the '<em><b>Commands</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int APPLICATION__COMMANDS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11; + public static final int APPLICATION__COMMANDS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>Addons</b></em>' containment reference list. @@ -476,7 +467,7 @@ public class ApplicationPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int APPLICATION__ADDONS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12; + public static final int APPLICATION__ADDONS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Categories</b></em>' containment reference list. @@ -485,7 +476,7 @@ public class ApplicationPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int APPLICATION__CATEGORIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13; + public static final int APPLICATION__CATEGORIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14; /** * The number of structural features of the '<em>Application</em>' class. @@ -494,7 +485,7 @@ public class ApplicationPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int APPLICATION_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14; + public static final int APPLICATION_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15; /** * The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation. @@ -552,15 +543,6 @@ public class ApplicationPackageImpl extends EPackageImpl { public static final int CONTRIBUTION__CONTRIBUTOR_URI = APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int CONTRIBUTION__CLONABLE_SNIPPETS = APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -652,15 +634,6 @@ public class ApplicationPackageImpl extends EPackageImpl { public static final int ADDON__CONTRIBUTOR_URI = CONTRIBUTION__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int ADDON__CLONABLE_SNIPPETS = CONTRIBUTION__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1055,20 +1028,6 @@ public class ApplicationPackageImpl extends EPackageImpl { * @generated */ public EReference getApplicationElement_TransientData() { - return (EReference)applicationElementEClass.getEStructuralFeatures().get(4); - } - - - /** - * Returns the meta object for the containment reference list '{@link org.eclipse.e4.ui.model.application.MApplicationElement#getClonableSnippets <em>Clonable Snippets</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Clonable Snippets</em>'. - * @see org.eclipse.e4.ui.model.application.MApplicationElement#getClonableSnippets() - * @see #getApplicationElement() - * @generated - */ - public EReference getApplicationElement_ClonableSnippets() { return (EReference)applicationElementEClass.getEStructuralFeatures().get(3); } @@ -1235,7 +1194,6 @@ public class ApplicationPackageImpl extends EPackageImpl { createEAttribute(applicationElementEClass, APPLICATION_ELEMENT__ELEMENT_ID); createEAttribute(applicationElementEClass, APPLICATION_ELEMENT__TAGS); createEAttribute(applicationElementEClass, APPLICATION_ELEMENT__CONTRIBUTOR_URI); - createEReference(applicationElementEClass, APPLICATION_ELEMENT__CLONABLE_SNIPPETS); createEReference(applicationElementEClass, APPLICATION_ELEMENT__TRANSIENT_DATA); contributionEClass = createEClass(CONTRIBUTION); @@ -1313,6 +1271,8 @@ public class ApplicationPackageImpl extends EPackageImpl { applicationEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(theMenuPackage.getTrimContributions()); applicationEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theUiPackage.getSnippetContainer()); + applicationEClass.getEGenericSuperTypes().add(g1); contributionEClass.getESuperTypes().add(this.getApplicationElement()); addonEClass.getESuperTypes().add(this.getContribution()); @@ -1330,7 +1290,6 @@ public class ApplicationPackageImpl extends EPackageImpl { initEAttribute(getApplicationElement_ElementId(), ecorePackage.getEString(), "elementId", null, 0, 1, MApplicationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getApplicationElement_Tags(), ecorePackage.getEString(), "tags", null, 0, -1, MApplicationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getApplicationElement_ContributorURI(), ecorePackage.getEString(), "contributorURI", null, 0, 1, MApplicationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEReference(getApplicationElement_ClonableSnippets(), this.getApplicationElement(), null, "clonableSnippets", null, 0, -1, MApplicationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getApplicationElement_TransientData(), this.getStringToObjectMap(), null, "transientData", null, 0, -1, MApplicationElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEClass(contributionEClass, MContribution.class, "Contribution", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -1467,14 +1426,6 @@ public class ApplicationPackageImpl extends EPackageImpl { public static final EReference APPLICATION_ELEMENT__TRANSIENT_DATA = eINSTANCE.getApplicationElement_TransientData(); /** - * The meta object literal for the '<em><b>Clonable Snippets</b></em>' containment reference list feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final EReference APPLICATION_ELEMENT__CLONABLE_SNIPPETS = eINSTANCE.getApplicationElement_ClonableSnippets(); - - /** * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.impl.ContributionImpl <em>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/MSnippetContainer.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MSnippetContainer.java new file mode 100644 index 00000000000..7cd6825cf85 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MSnippetContainer.java @@ -0,0 +1,46 @@ +/**
+ * Copyright (c) 2008 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;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Snippet Container</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer#getSnippets <em>Snippets</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @model
+ * @generated
+ */
+public interface MSnippetContainer {
+ /**
+ * Returns the value of the '<em><b>Snippets</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.e4.ui.model.application.ui.MUIElement}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Snippets</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Snippets</em>' containment reference list.
+ * @model containment="true"
+ * @generated
+ */
+ List<MUIElement> getSnippets();
+
+} // MSnippetContainer
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MUiFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MUiFactory.java index 689a2b04ce8..6ab777d95f8 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MUiFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MUiFactory.java @@ -36,4 +36,13 @@ public interface MUiFactory { */ MCoreExpression createCoreExpression(); + /** + * Returns a new object of class '<em>Snippet Container</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Snippet Container</em>'. + * @generated + */ + MSnippetContainer createSnippetContainer(); + } //MUiFactory diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl.java index 8b6326bfc9e..58864263c16 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl.java @@ -114,15 +114,6 @@ public class AdvancedPackageImpl extends EPackageImpl { public static final int PLACEHOLDER__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PLACEHOLDER__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -304,15 +295,6 @@ public class AdvancedPackageImpl extends EPackageImpl { public static final int PERSPECTIVE__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PERSPECTIVE__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -575,15 +557,6 @@ public class AdvancedPackageImpl extends EPackageImpl { public static final int PERSPECTIVE_STACK__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PERSPECTIVE_STACK__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -765,15 +738,6 @@ public class AdvancedPackageImpl extends EPackageImpl { public static final int AREA__CONTRIBUTOR_URI = BasicPackageImpl.PART_SASH_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int AREA__CLONABLE_SNIPPETS = BasicPackageImpl.PART_SASH_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWindow.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWindow.java index 665ecfa01ad..c8130b411aa 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWindow.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWindow.java @@ -15,6 +15,7 @@ import org.eclipse.e4.ui.model.application.commands.MBindings; import org.eclipse.e4.ui.model.application.commands.MHandlerContainer; import org.eclipse.e4.ui.model.application.ui.MContext; import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.menu.MMenu; @@ -40,7 +41,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MMenu; * @model * @generated */ -public interface MWindow extends MElementContainer<MWindowElement>, MUILabel, MContext, MHandlerContainer, MBindings { +public interface MWindow extends MElementContainer<MWindowElement>, MUILabel, MContext, MHandlerContainer, MBindings, MSnippetContainer { /** * Returns the value of the '<em><b>Main Menu</b></em>' containment reference. * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java index 0991952e4f2..23ec6c1f3c3 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java @@ -222,15 +222,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int PART__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PART__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -555,15 +546,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int INPUT_PART__CONTRIBUTOR_URI = PART__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int INPUT_PART__CLONABLE_SNIPPETS = PART__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -897,15 +879,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int PART_STACK__CONTRIBUTOR_URI = UiPackageImpl.GENERIC_STACK__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PART_STACK__CLONABLE_SNIPPETS = UiPackageImpl.GENERIC_STACK__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1077,15 +1050,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int PART_SASH_CONTAINER__CONTRIBUTOR_URI = UiPackageImpl.GENERIC_TILE__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PART_SASH_CONTAINER__CLONABLE_SNIPPETS = UiPackageImpl.GENERIC_TILE__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1266,15 +1230,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int WINDOW__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int WINDOW__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1464,13 +1419,22 @@ public class BasicPackageImpl extends EPackageImpl { public static final int WINDOW__BINDING_CONTEXTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7; /** + * The feature id for the '<em><b>Snippets</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int WINDOW__SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 8; + + /** * The feature id for the '<em><b>Main Menu</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int WINDOW__MAIN_MENU = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 8; + public static final int WINDOW__MAIN_MENU = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 9; /** * The feature id for the '<em><b>X</b></em>' attribute. @@ -1479,7 +1443,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW__X = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 9; + public static final int WINDOW__X = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10; /** * The feature id for the '<em><b>Y</b></em>' attribute. @@ -1488,7 +1452,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW__Y = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10; + public static final int WINDOW__Y = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11; /** * The feature id for the '<em><b>Width</b></em>' attribute. @@ -1497,7 +1461,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW__WIDTH = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11; + public static final int WINDOW__WIDTH = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12; /** * The feature id for the '<em><b>Height</b></em>' attribute. @@ -1506,7 +1470,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW__HEIGHT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12; + public static final int WINDOW__HEIGHT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13; /** * The feature id for the '<em><b>Windows</b></em>' containment reference list. @@ -1515,7 +1479,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13; + public static final int WINDOW__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14; /** * The feature id for the '<em><b>Shared Elements</b></em>' containment reference list. @@ -1524,7 +1488,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW__SHARED_ELEMENTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14; + public static final int WINDOW__SHARED_ELEMENTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15; /** * The number of structural features of the '<em>Window</em>' class. @@ -1533,7 +1497,7 @@ public class BasicPackageImpl extends EPackageImpl { * @generated * @ordered */ - public static final int WINDOW_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15; + public static final int WINDOW_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 16; /** * The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation. @@ -1599,15 +1563,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int TRIMMED_WINDOW__CONTRIBUTOR_URI = WINDOW__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TRIMMED_WINDOW__CLONABLE_SNIPPETS = WINDOW__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1797,6 +1752,15 @@ public class BasicPackageImpl extends EPackageImpl { public static final int TRIMMED_WINDOW__BINDING_CONTEXTS = WINDOW__BINDING_CONTEXTS; /** + * The feature id for the '<em><b>Snippets</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int TRIMMED_WINDOW__SNIPPETS = WINDOW__SNIPPETS; + + /** * The feature id for the '<em><b>Main Menu</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1941,15 +1905,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int TRIM_ELEMENT__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TRIM_ELEMENT__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2103,15 +2058,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int PART_SASH_CONTAINER_ELEMENT__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int PART_SASH_CONTAINER_ELEMENT__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2265,15 +2211,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int WINDOW_ELEMENT__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int WINDOW_ELEMENT__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2427,15 +2364,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int TRIM_BAR__CONTRIBUTOR_URI = UiPackageImpl.GENERIC_TRIM_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TRIM_BAR__CLONABLE_SNIPPETS = UiPackageImpl.GENERIC_TRIM_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2616,15 +2544,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int STACK_ELEMENT__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int STACK_ELEMENT__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3353,6 +3272,8 @@ public class BasicPackageImpl extends EPackageImpl { windowEClass.getEGenericSuperTypes().add(g1); g1 = createEGenericType(theCommandsPackage.getBindings()); windowEClass.getEGenericSuperTypes().add(g1); + g1 = createEGenericType(theUiPackage.getSnippetContainer()); + windowEClass.getEGenericSuperTypes().add(g1); trimmedWindowEClass.getESuperTypes().add(this.getWindow()); trimElementEClass.getESuperTypes().add(theUiPackage.getUIElement()); partSashContainerElementEClass.getESuperTypes().add(theUiPackage.getUIElement()); diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.java index 8b024bcfd45..078b84a2bea 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WindowImpl.java @@ -24,6 +24,7 @@ import org.eclipse.e4.ui.model.application.commands.impl.CommandsPackageImpl; import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl; import org.eclipse.e4.ui.model.application.impl.StringToStringMapImpl; import org.eclipse.e4.ui.model.application.ui.MContext; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.MWindow; @@ -60,6 +61,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getProperties <em>Properties</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getHandlers <em>Handlers</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getBindingContexts <em>Binding Contexts</em>}</li> + * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getSnippets <em>Snippets</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getMainMenu <em>Main Menu</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getX <em>X</em>}</li> * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getY <em>Y</em>}</li> @@ -194,6 +196,16 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements protected EList<MBindingContext> bindingContexts; /** + * The cached value of the '{@link #getSnippets() <em>Snippets</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSnippets() + * @generated + * @ordered + */ + protected EList<MUIElement> snippets; + + /** * The cached value of the '{@link #getMainMenu() <em>Main Menu</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -459,6 +471,18 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements * <!-- end-user-doc --> * @generated */ + public List<MUIElement> getSnippets() { + if (snippets == null) { + snippets = new EObjectContainmentEList<MUIElement>(MUIElement.class, this, BasicPackageImpl.WINDOW__SNIPPETS); + } + return snippets; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public MMenu getMainMenu() { return mainMenu; } @@ -633,6 +657,8 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements return ((InternalEList<?>)((EMap.InternalMapView<String, String>)getProperties()).eMap()).basicRemove(otherEnd, msgs); case BasicPackageImpl.WINDOW__HANDLERS: return ((InternalEList<?>)getHandlers()).basicRemove(otherEnd, msgs); + case BasicPackageImpl.WINDOW__SNIPPETS: + return ((InternalEList<?>)getSnippets()).basicRemove(otherEnd, msgs); case BasicPackageImpl.WINDOW__MAIN_MENU: return basicSetMainMenu(null, msgs); case BasicPackageImpl.WINDOW__WINDOWS: @@ -668,6 +694,8 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements return getHandlers(); case BasicPackageImpl.WINDOW__BINDING_CONTEXTS: return getBindingContexts(); + case BasicPackageImpl.WINDOW__SNIPPETS: + return getSnippets(); case BasicPackageImpl.WINDOW__MAIN_MENU: return getMainMenu(); case BasicPackageImpl.WINDOW__X: @@ -722,6 +750,10 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements getBindingContexts().clear(); getBindingContexts().addAll((Collection<? extends MBindingContext>)newValue); return; + case BasicPackageImpl.WINDOW__SNIPPETS: + getSnippets().clear(); + getSnippets().addAll((Collection<? extends MUIElement>)newValue); + return; case BasicPackageImpl.WINDOW__MAIN_MENU: setMainMenu((MMenu)newValue); return; @@ -781,6 +813,9 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements case BasicPackageImpl.WINDOW__BINDING_CONTEXTS: getBindingContexts().clear(); return; + case BasicPackageImpl.WINDOW__SNIPPETS: + getSnippets().clear(); + return; case BasicPackageImpl.WINDOW__MAIN_MENU: setMainMenu((MMenu)null); return; @@ -830,6 +865,8 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements return handlers != null && !handlers.isEmpty(); case BasicPackageImpl.WINDOW__BINDING_CONTEXTS: return bindingContexts != null && !bindingContexts.isEmpty(); + case BasicPackageImpl.WINDOW__SNIPPETS: + return snippets != null && !snippets.isEmpty(); case BasicPackageImpl.WINDOW__MAIN_MENU: return mainMenu != null; case BasicPackageImpl.WINDOW__X: @@ -883,6 +920,12 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements default: return -1; } } + if (baseClass == MSnippetContainer.class) { + switch (derivedFeatureID) { + case BasicPackageImpl.WINDOW__SNIPPETS: return UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS; + default: return -1; + } + } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } @@ -921,6 +964,12 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements default: return -1; } } + if (baseClass == MSnippetContainer.class) { + switch (baseFeatureID) { + case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS: return BasicPackageImpl.WINDOW__SNIPPETS; + default: return -1; + } + } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } @@ -953,6 +1002,11 @@ public class WindowImpl extends ElementContainerImpl<MWindowElement> implements default: return -1; } } + if (baseClass == MSnippetContainer.class) { + switch (baseOperationID) { + default: return -1; + } + } return super.eDerivedOperationID(baseOperationID, baseClass); } diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java index 2aebf4fd701..d39fc070c83 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java @@ -21,6 +21,7 @@ import org.eclipse.e4.ui.model.application.ui.MGenericStack; import org.eclipse.e4.ui.model.application.ui.MGenericTile; import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer; import org.eclipse.e4.ui.model.application.ui.MInput; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.*; @@ -190,6 +191,10 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { return createGenericTileAdapter(); } @Override + public Adapter caseSnippetContainer(MSnippetContainer object) { + return createSnippetContainerAdapter(); + } + @Override public <T extends MUIElement> Adapter caseGenericTrimContainer(MGenericTrimContainer<T> object) { return createGenericTrimContainerAdapter(); } @@ -536,6 +541,20 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet Container</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.MSnippetContainer + * @generated + */ + public Adapter createSnippetContainerAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer <em>Generic Trim Container</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/basic/util/BasicSwitch.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java index 3f23cf2b85e..db96d370109 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java @@ -21,6 +21,7 @@ import org.eclipse.e4.ui.model.application.ui.MGenericStack; import org.eclipse.e4.ui.model.application.ui.MGenericTile; import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer; import org.eclipse.e4.ui.model.application.ui.MInput; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.*; @@ -165,6 +166,7 @@ public class BasicSwitch<T1> extends Switch<T1> { if (result == null) result = caseContext(window); if (result == null) result = caseHandlerContainer(window); if (result == null) result = caseBindings(window); + if (result == null) result = caseSnippetContainer(window); if (result == null) result = caseUIElement(window); if (result == null) result = caseApplicationElement(window); if (result == null) result = defaultCase(theEObject); @@ -179,6 +181,7 @@ public class BasicSwitch<T1> extends Switch<T1> { if (result == null) result = caseContext(trimmedWindow); if (result == null) result = caseHandlerContainer(trimmedWindow); if (result == null) result = caseBindings(trimmedWindow); + if (result == null) result = caseSnippetContainer(trimmedWindow); if (result == null) result = caseUIElement(trimmedWindow); if (result == null) result = caseApplicationElement(trimmedWindow); if (result == null) result = defaultCase(theEObject); @@ -576,6 +579,21 @@ public class BasicSwitch<T1> extends Switch<T1> { } /** + * Returns the result of interpreting the object as an instance of '<em>Snippet Container</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>Snippet Container</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSnippetContainer(MSnippetContainer object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>Generic Trim Container</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/SnippetContainerImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/SnippetContainerImpl.java new file mode 100644 index 00000000000..240eca79c08 --- /dev/null +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/SnippetContainerImpl.java @@ -0,0 +1,160 @@ +/**
+ * Copyright (c) 2008 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.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.MUIElement;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Snippet Container</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.e4.ui.model.application.ui.impl.SnippetContainerImpl#getSnippets <em>Snippets</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SnippetContainerImpl extends Container implements MSnippetContainer {
+ /**
+ * The cached value of the '{@link #getSnippets() <em>Snippets</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSnippets()
+ * @generated
+ * @ordered
+ */
+ protected EList<MUIElement> snippets;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected SnippetContainerImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return UiPackageImpl.Literals.SNIPPET_CONTAINER;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public List<MUIElement> getSnippets() {
+ if (snippets == null) {
+ snippets = new EObjectContainmentEList<MUIElement>(MUIElement.class, this, UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS);
+ }
+ return snippets;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS:
+ return ((InternalEList<?>)getSnippets()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS:
+ return getSnippets();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS:
+ getSnippets().clear();
+ getSnippets().addAll((Collection<? extends MUIElement>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS:
+ getSnippets().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case UiPackageImpl.SNIPPET_CONTAINER__SNIPPETS:
+ return snippets != null && !snippets.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //SnippetContainerImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java index f9d49346b53..d73fbbb1e0f 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java @@ -74,6 +74,7 @@ public class UiFactoryImpl extends EFactoryImpl implements MUiFactory { public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { case UiPackageImpl.CORE_EXPRESSION: return (EObject)createCoreExpression(); + case UiPackageImpl.SNIPPET_CONTAINER: return (EObject)createSnippetContainer(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -124,6 +125,16 @@ public class UiFactoryImpl extends EFactoryImpl implements MUiFactory { * <!-- end-user-doc --> * @generated */ + public MSnippetContainer createSnippetContainer() { + SnippetContainerImpl snippetContainer = new SnippetContainerImpl(); + return snippetContainer; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public SideValue createSideValueFromString(EDataType eDataType, String initialValue) { SideValue result = SideValue.get(initialValue); if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java index bebb7672ce4..229955ccc8c 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java @@ -21,6 +21,7 @@ import org.eclipse.e4.ui.model.application.ui.MGenericStack; import org.eclipse.e4.ui.model.application.ui.MGenericTile; import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer; import org.eclipse.e4.ui.model.application.ui.MInput; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.MUiFactory; @@ -254,15 +255,6 @@ public class UiPackageImpl extends EPackageImpl { public static final int UI_ELEMENT__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int UI_ELEMENT__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -396,260 +388,251 @@ public class UiPackageImpl extends EPackageImpl { * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getUILabel() * @generated */ - public static final int UI_LABEL = 4; + public static final int UI_LABEL = 5; /** - * The feature id for the '<em><b>Label</b></em>' attribute. + * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl + * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getElementContainer() * @generated - * @ordered */ - public static final int UI_LABEL__LABEL = 0; + public static final int ELEMENT_CONTAINER = 4; /** - * The feature id for the '<em><b>Icon URI</b></em>' attribute. + * The feature id for the '<em><b>Element Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int UI_LABEL__ICON_URI = 1; + public static final int ELEMENT_CONTAINER__ELEMENT_ID = UI_ELEMENT__ELEMENT_ID; /** - * The feature id for the '<em><b>Tooltip</b></em>' attribute. + * The feature id for the '<em><b>Tags</b></em>' attribute list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int UI_LABEL__TOOLTIP = 2; + public static final int ELEMENT_CONTAINER__TAGS = UI_ELEMENT__TAGS; /** - * The number of structural features of the '<em>UI Label</em>' class. + * The feature id for the '<em><b>Contributor URI</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int UI_LABEL_FEATURE_COUNT = 3; + public static final int ELEMENT_CONTAINER__CONTRIBUTOR_URI = UI_ELEMENT__CONTRIBUTOR_URI; /** - * The operation id for the '<em>Get Localized Label</em>' operation. + * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int UI_LABEL___GET_LOCALIZED_LABEL = 0; + public static final int ELEMENT_CONTAINER__TRANSIENT_DATA = UI_ELEMENT__TRANSIENT_DATA; /** - * The operation id for the '<em>Get Localized Tooltip</em>' operation. + * The feature id for the '<em><b>Widget</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int UI_LABEL___GET_LOCALIZED_TOOLTIP = 1; + public static final int ELEMENT_CONTAINER__WIDGET = UI_ELEMENT__WIDGET; /** - * The number of operations of the '<em>UI Label</em>' class. + * The feature id for the '<em><b>Renderer</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int UI_LABEL_OPERATION_COUNT = 2; - - /** - * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl - * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getElementContainer() - * @generated - */ - public static final int ELEMENT_CONTAINER = 5; + public static final int ELEMENT_CONTAINER__RENDERER = UI_ELEMENT__RENDERER; /** - * The feature id for the '<em><b>Element Id</b></em>' attribute. + * 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 ELEMENT_CONTAINER__ELEMENT_ID = UI_ELEMENT__ELEMENT_ID; + public static final int ELEMENT_CONTAINER__TO_BE_RENDERED = UI_ELEMENT__TO_BE_RENDERED; /** - * The feature id for the '<em><b>Tags</b></em>' attribute list. + * The feature id for the '<em><b>On Top</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__TAGS = UI_ELEMENT__TAGS; + public static final int ELEMENT_CONTAINER__ON_TOP = UI_ELEMENT__ON_TOP; /** - * The feature id for the '<em><b>Contributor URI</b></em>' attribute. + * The feature id for the '<em><b>Visible</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__CONTRIBUTOR_URI = UI_ELEMENT__CONTRIBUTOR_URI; + public static final int ELEMENT_CONTAINER__VISIBLE = UI_ELEMENT__VISIBLE; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. + * The feature id for the '<em><b>Parent</b></em>' container reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__CLONABLE_SNIPPETS = UI_ELEMENT__CLONABLE_SNIPPETS; + public static final int ELEMENT_CONTAINER__PARENT = UI_ELEMENT__PARENT; /** - * The feature id for the '<em><b>Transient Data</b></em>' map. + * The feature id for the '<em><b>Container Data</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__TRANSIENT_DATA = UI_ELEMENT__TRANSIENT_DATA; + public static final int ELEMENT_CONTAINER__CONTAINER_DATA = UI_ELEMENT__CONTAINER_DATA; /** - * The feature id for the '<em><b>Widget</b></em>' attribute. + * 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 ELEMENT_CONTAINER__WIDGET = UI_ELEMENT__WIDGET; + public static final int ELEMENT_CONTAINER__CUR_SHARED_REF = UI_ELEMENT__CUR_SHARED_REF; /** - * The feature id for the '<em><b>Renderer</b></em>' attribute. + * 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 ELEMENT_CONTAINER__RENDERER = UI_ELEMENT__RENDERER; + public static final int ELEMENT_CONTAINER__VISIBLE_WHEN = UI_ELEMENT__VISIBLE_WHEN; /** - * The feature id for the '<em><b>To Be Rendered</b></em>' attribute. + * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__TO_BE_RENDERED = UI_ELEMENT__TO_BE_RENDERED; + public static final int ELEMENT_CONTAINER__ACCESSIBILITY_PHRASE = UI_ELEMENT__ACCESSIBILITY_PHRASE; /** - * The feature id for the '<em><b>On Top</b></em>' attribute. + * 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 ELEMENT_CONTAINER__ON_TOP = UI_ELEMENT__ON_TOP; + public static final int ELEMENT_CONTAINER__CHILDREN = UI_ELEMENT_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Visible</b></em>' attribute. + * The feature id for the '<em><b>Selected Element</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__VISIBLE = UI_ELEMENT__VISIBLE; + public static final int ELEMENT_CONTAINER__SELECTED_ELEMENT = UI_ELEMENT_FEATURE_COUNT + 1; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. + * The number of structural features of the '<em>Element Container</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__PARENT = UI_ELEMENT__PARENT; + public static final int ELEMENT_CONTAINER_FEATURE_COUNT = UI_ELEMENT_FEATURE_COUNT + 2; /** - * The feature id for the '<em><b>Container Data</b></em>' attribute. + * The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__CONTAINER_DATA = UI_ELEMENT__CONTAINER_DATA; + public static final int ELEMENT_CONTAINER___GET_LOCALIZED_ACCESSIBILITY_PHRASE = UI_ELEMENT___GET_LOCALIZED_ACCESSIBILITY_PHRASE; /** - * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference. + * The number of operations of the '<em>Element Container</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__CUR_SHARED_REF = UI_ELEMENT__CUR_SHARED_REF; + public static final int ELEMENT_CONTAINER_OPERATION_COUNT = UI_ELEMENT_OPERATION_COUNT + 0; /** - * The feature id for the '<em><b>Visible When</b></em>' containment reference. + * The feature id for the '<em><b>Label</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__VISIBLE_WHEN = UI_ELEMENT__VISIBLE_WHEN; + public static final int UI_LABEL__LABEL = 0; /** - * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute. + * The feature id for the '<em><b>Icon URI</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__ACCESSIBILITY_PHRASE = UI_ELEMENT__ACCESSIBILITY_PHRASE; + public static final int UI_LABEL__ICON_URI = 1; /** - * The feature id for the '<em><b>Children</b></em>' containment reference list. + * The feature id for the '<em><b>Tooltip</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__CHILDREN = UI_ELEMENT_FEATURE_COUNT + 0; + public static final int UI_LABEL__TOOLTIP = 2; /** - * The feature id for the '<em><b>Selected Element</b></em>' reference. + * The number of structural features of the '<em>UI Label</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER__SELECTED_ELEMENT = UI_ELEMENT_FEATURE_COUNT + 1; + public static final int UI_LABEL_FEATURE_COUNT = 3; /** - * The number of structural features of the '<em>Element Container</em>' class. + * The operation id for the '<em>Get Localized Label</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER_FEATURE_COUNT = UI_ELEMENT_FEATURE_COUNT + 2; + public static final int UI_LABEL___GET_LOCALIZED_LABEL = 0; /** - * The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation. + * The operation id for the '<em>Get Localized Tooltip</em>' operation. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER___GET_LOCALIZED_ACCESSIBILITY_PHRASE = UI_ELEMENT___GET_LOCALIZED_ACCESSIBILITY_PHRASE; + public static final int UI_LABEL___GET_LOCALIZED_TOOLTIP = 1; /** - * The number of operations of the '<em>Element Container</em>' class. + * The number of operations of the '<em>UI Label</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - public static final int ELEMENT_CONTAINER_OPERATION_COUNT = UI_ELEMENT_OPERATION_COUNT + 0; + public static final int UI_LABEL_OPERATION_COUNT = 2; /** * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.GenericStackImpl <em>Generic Stack</em>}' class. @@ -689,15 +672,6 @@ public class UiPackageImpl extends EPackageImpl { public static final int GENERIC_STACK__CONTRIBUTOR_URI = ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int GENERIC_STACK__CLONABLE_SNIPPETS = ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -879,15 +853,6 @@ public class UiPackageImpl extends EPackageImpl { public static final int GENERIC_TILE__CONTRIBUTOR_URI = ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int GENERIC_TILE__CLONABLE_SNIPPETS = ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1078,15 +1043,6 @@ public class UiPackageImpl extends EPackageImpl { public static final int GENERIC_TRIM_CONTAINER__CONTRIBUTOR_URI = ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int GENERIC_TRIM_CONTAINER__CLONABLE_SNIPPETS = ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1277,15 +1233,6 @@ public class UiPackageImpl extends EPackageImpl { public static final int EXPRESSION__CONTRIBUTOR_URI = ApplicationPackageImpl.APPLICATION_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int EXPRESSION__CLONABLE_SNIPPETS = ApplicationPackageImpl.APPLICATION_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1350,15 +1297,6 @@ public class UiPackageImpl extends EPackageImpl { public static final int CORE_EXPRESSION__CONTRIBUTOR_URI = EXPRESSION__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int CORE_EXPRESSION__CLONABLE_SNIPPETS = EXPRESSION__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1404,6 +1342,43 @@ public class UiPackageImpl extends EPackageImpl { public static final int CORE_EXPRESSION_OPERATION_COUNT = EXPRESSION_OPERATION_COUNT + 0; /** + * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.SnippetContainerImpl <em>Snippet Container</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.e4.ui.model.application.ui.impl.SnippetContainerImpl + * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getSnippetContainer() + * @generated + */ + public static final int SNIPPET_CONTAINER = 11; + + /** + * The feature id for the '<em><b>Snippets</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int SNIPPET_CONTAINER__SNIPPETS = 0; + + /** + * The number of structural features of the '<em>Snippet Container</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int SNIPPET_CONTAINER_FEATURE_COUNT = 1; + + /** + * The number of operations of the '<em>Snippet Container</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + public static final int SNIPPET_CONTAINER_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.SideValue <em>Side Value</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1411,7 +1386,7 @@ public class UiPackageImpl extends EPackageImpl { * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getSideValue() * @generated */ - public static final int SIDE_VALUE = 11; + public static final int SIDE_VALUE = 12; /** * <!-- begin-user-doc --> @@ -1495,6 +1470,13 @@ public class UiPackageImpl extends EPackageImpl { * <!-- end-user-doc --> * @generated */ + private EClass snippetContainerEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EEnum sideValueEEnum = null; /** @@ -2070,6 +2052,33 @@ public class UiPackageImpl extends EPackageImpl { /** + * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet Container</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Snippet Container</em>'. + * @see org.eclipse.e4.ui.model.application.ui.MSnippetContainer + * @generated + */ + public EClass getSnippetContainer() { + return snippetContainerEClass; + } + + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer#getSnippets <em>Snippets</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>Snippets</em>'. + * @see org.eclipse.e4.ui.model.application.ui.MSnippetContainer#getSnippets() + * @see #getSnippetContainer() + * @generated + */ + public EReference getSnippetContainer_Snippets() { + return (EReference)snippetContainerEClass.getEStructuralFeatures().get(0); + } + + + /** * Returns the meta object for enum '{@link org.eclipse.e4.ui.model.application.ui.SideValue <em>Side Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2135,6 +2144,10 @@ public class UiPackageImpl extends EPackageImpl { createEAttribute(uiElementEClass, UI_ELEMENT__ACCESSIBILITY_PHRASE); createEOperation(uiElementEClass, UI_ELEMENT___GET_LOCALIZED_ACCESSIBILITY_PHRASE); + elementContainerEClass = createEClass(ELEMENT_CONTAINER); + createEReference(elementContainerEClass, ELEMENT_CONTAINER__CHILDREN); + createEReference(elementContainerEClass, ELEMENT_CONTAINER__SELECTED_ELEMENT); + uiLabelEClass = createEClass(UI_LABEL); createEAttribute(uiLabelEClass, UI_LABEL__LABEL); createEAttribute(uiLabelEClass, UI_LABEL__ICON_URI); @@ -2142,10 +2155,6 @@ public class UiPackageImpl extends EPackageImpl { createEOperation(uiLabelEClass, UI_LABEL___GET_LOCALIZED_LABEL); createEOperation(uiLabelEClass, UI_LABEL___GET_LOCALIZED_TOOLTIP); - elementContainerEClass = createEClass(ELEMENT_CONTAINER); - createEReference(elementContainerEClass, ELEMENT_CONTAINER__CHILDREN); - createEReference(elementContainerEClass, ELEMENT_CONTAINER__SELECTED_ELEMENT); - genericStackEClass = createEClass(GENERIC_STACK); genericTileEClass = createEClass(GENERIC_TILE); @@ -2160,6 +2169,9 @@ public class UiPackageImpl extends EPackageImpl { createEAttribute(coreExpressionEClass, CORE_EXPRESSION__CORE_EXPRESSION_ID); createEAttribute(coreExpressionEClass, CORE_EXPRESSION__CORE_EXPRESSION); + snippetContainerEClass = createEClass(SNIPPET_CONTAINER); + createEReference(snippetContainerEClass, SNIPPET_CONTAINER__SNIPPETS); + // Create enums sideValueEEnum = createEEnum(SIDE_VALUE); } @@ -2261,6 +2273,12 @@ public class UiPackageImpl extends EPackageImpl { initEOperation(getUIElement__GetLocalizedAccessibilityPhrase(), ecorePackage.getEString(), "getLocalizedAccessibilityPhrase", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + initEClass(elementContainerEClass, MElementContainer.class, "ElementContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + g1 = createEGenericType(elementContainerEClass_T); + initEReference(getElementContainer_Children(), g1, this.getUIElement_Parent(), "children", null, 0, -1, MElementContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + g1 = createEGenericType(elementContainerEClass_T); + initEReference(getElementContainer_SelectedElement(), g1, null, "selectedElement", null, 0, 1, MElementContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(uiLabelEClass, MUILabel.class, "UILabel", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getUILabel_Label(), ecorePackage.getEString(), "label", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getUILabel_IconURI(), ecorePackage.getEString(), "iconURI", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -2270,12 +2288,6 @@ public class UiPackageImpl extends EPackageImpl { initEOperation(getUILabel__GetLocalizedTooltip(), ecorePackage.getEString(), "getLocalizedTooltip", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ - initEClass(elementContainerEClass, MElementContainer.class, "ElementContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - g1 = createEGenericType(elementContainerEClass_T); - initEReference(getElementContainer_Children(), g1, this.getUIElement_Parent(), "children", null, 0, -1, MElementContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - g1 = createEGenericType(elementContainerEClass_T); - initEReference(getElementContainer_SelectedElement(), g1, null, "selectedElement", null, 0, 1, MElementContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - initEClass(genericStackEClass, MGenericStack.class, "GenericStack", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(genericTileEClass, MGenericTile.class, "GenericTile", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -2290,6 +2302,9 @@ public class UiPackageImpl extends EPackageImpl { initEAttribute(getCoreExpression_CoreExpressionId(), ecorePackage.getEString(), "coreExpressionId", "", 0, 1, MCoreExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ initEAttribute(getCoreExpression_CoreExpression(), ecorePackage.getEJavaObject(), "coreExpression", null, 0, 1, MCoreExpression.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEClass(snippetContainerEClass, MSnippetContainer.class, "SnippetContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getSnippetContainer_Snippets(), this.getUIElement(), null, "snippets", null, 0, -1, MSnippetContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + // Initialize enums and add enum literals initEEnum(sideValueEEnum, SideValue.class, "SideValue"); //$NON-NLS-1$ addEEnumLiteral(sideValueEEnum, SideValue.TOP); @@ -2638,6 +2653,24 @@ public class UiPackageImpl extends EPackageImpl { public static final EAttribute CORE_EXPRESSION__CORE_EXPRESSION = eINSTANCE.getCoreExpression_CoreExpression(); /** + * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.impl.SnippetContainerImpl <em>Snippet Container</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.e4.ui.model.application.ui.impl.SnippetContainerImpl + * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getSnippetContainer() + * @generated + */ + public static final EClass SNIPPET_CONTAINER = eINSTANCE.getSnippetContainer(); + + /** + * The meta object literal for the '<em><b>Snippets</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static final EReference SNIPPET_CONTAINER__SNIPPETS = eINSTANCE.getSnippetContainer_Snippets(); + + /** * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.SideValue <em>Side Value</em>}' enum. * <!-- 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/MenuPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java index ffda3897f7e..686ee5aa418 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 @@ -142,15 +142,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int ITEM__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int ITEM__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -386,15 +377,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int HANDLED_ITEM__CONTRIBUTOR_URI = ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int HANDLED_ITEM__CLONABLE_SNIPPETS = ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -657,15 +639,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int MENU_ELEMENT__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int MENU_ELEMENT__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -892,15 +865,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int MENU_ITEM__CONTRIBUTOR_URI = ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int MENU_ITEM__CLONABLE_SNIPPETS = ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1154,15 +1118,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int MENU_SEPARATOR__CONTRIBUTOR_URI = MENU_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int MENU_SEPARATOR__CLONABLE_SNIPPETS = MENU_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1389,15 +1344,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int MENU__CONTRIBUTOR_URI = MENU_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int MENU__CLONABLE_SNIPPETS = MENU_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1651,15 +1597,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int MENU_CONTRIBUTION__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int MENU_CONTRIBUTION__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1859,15 +1796,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int POPUP_MENU__CONTRIBUTOR_URI = MENU__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int POPUP_MENU__CLONABLE_SNIPPETS = MENU__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2148,15 +2076,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int DIRECT_MENU_ITEM__CONTRIBUTOR_URI = MENU_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int DIRECT_MENU_ITEM__CLONABLE_SNIPPETS = MENU_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2437,15 +2356,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int HANDLED_MENU_ITEM__CONTRIBUTOR_URI = MENU_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int HANDLED_MENU_ITEM__CLONABLE_SNIPPETS = MENU_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2726,15 +2636,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TOOL_ITEM__CONTRIBUTOR_URI = ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TOOL_ITEM__CLONABLE_SNIPPETS = ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -2979,15 +2880,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TOOL_BAR__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TOOL_BAR__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3169,15 +3061,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TOOL_BAR_ELEMENT__CONTRIBUTOR_URI = UiPackageImpl.UI_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TOOL_BAR_ELEMENT__CLONABLE_SNIPPETS = UiPackageImpl.UI_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3341,15 +3224,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TOOL_CONTROL__CONTRIBUTOR_URI = TOOL_BAR_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TOOL_CONTROL__CLONABLE_SNIPPETS = TOOL_BAR_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3540,15 +3414,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int HANDLED_TOOL_ITEM__CONTRIBUTOR_URI = TOOL_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int HANDLED_TOOL_ITEM__CLONABLE_SNIPPETS = TOOL_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -3820,15 +3685,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int DIRECT_TOOL_ITEM__CONTRIBUTOR_URI = TOOL_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int DIRECT_TOOL_ITEM__CLONABLE_SNIPPETS = TOOL_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4100,15 +3956,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TOOL_BAR_SEPARATOR__CONTRIBUTOR_URI = TOOL_BAR_ELEMENT__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TOOL_BAR_SEPARATOR__CLONABLE_SNIPPETS = TOOL_BAR_ELEMENT__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4309,15 +4156,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int RENDERED_MENU__CONTRIBUTOR_URI = MENU__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int RENDERED_MENU__CLONABLE_SNIPPETS = MENU__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4580,15 +4418,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int RENDERED_TOOL_BAR__CONTRIBUTOR_URI = TOOL_BAR__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int RENDERED_TOOL_BAR__CLONABLE_SNIPPETS = TOOL_BAR__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -4779,15 +4608,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TOOL_BAR_CONTRIBUTION__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TOOL_BAR_CONTRIBUTION__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5024,15 +4844,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int TRIM_CONTRIBUTION__CONTRIBUTOR_URI = UiPackageImpl.ELEMENT_CONTAINER__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int TRIM_CONTRIBUTION__CLONABLE_SNIPPETS = UiPackageImpl.ELEMENT_CONTAINER__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5269,15 +5080,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int RENDERED_MENU_ITEM__CONTRIBUTOR_URI = MENU_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int RENDERED_MENU_ITEM__CLONABLE_SNIPPETS = MENU_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5540,15 +5342,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int OPAQUE_TOOL_ITEM__CONTRIBUTOR_URI = TOOL_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int OPAQUE_TOOL_ITEM__CLONABLE_SNIPPETS = TOOL_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -5802,15 +5595,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int OPAQUE_MENU_ITEM__CONTRIBUTOR_URI = MENU_ITEM__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int OPAQUE_MENU_ITEM__CLONABLE_SNIPPETS = MENU_ITEM__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -6073,15 +5857,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int OPAQUE_MENU_SEPARATOR__CONTRIBUTOR_URI = MENU_SEPARATOR__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int OPAQUE_MENU_SEPARATOR__CLONABLE_SNIPPETS = MENU_SEPARATOR__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -6317,15 +6092,6 @@ public class MenuPackageImpl extends EPackageImpl { public static final int OPAQUE_MENU__CONTRIBUTOR_URI = MENU__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Clonable Snippets</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - public static final int OPAQUE_MENU__CLONABLE_SNIPPETS = MENU__CLONABLE_SNIPPETS; - - /** * The feature id for the '<em><b>Transient Data</b></em>' map. * <!-- begin-user-doc --> * <!-- end-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java index b565df7f4e0..c03ec6cd8fc 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java @@ -102,14 +102,14 @@ public class UiAdapterFactory extends AdapterFactoryImpl { return createUIElementAdapter(); } @Override - public Adapter caseUILabel(MUILabel object) { - return createUILabelAdapter(); - } - @Override public <T extends MUIElement> Adapter caseElementContainer(MElementContainer<T> object) { return createElementContainerAdapter(); } @Override + public Adapter caseUILabel(MUILabel object) { + return createUILabelAdapter(); + } + @Override public <T extends MUIElement> Adapter caseGenericStack(MGenericStack<T> object) { return createGenericStackAdapter(); } @@ -130,6 +130,10 @@ public class UiAdapterFactory extends AdapterFactoryImpl { return createCoreExpressionAdapter(); } @Override + public Adapter caseSnippetContainer(MSnippetContainer object) { + return createSnippetContainerAdapter(); + } + @Override public Adapter caseApplicationElement(MApplicationElement object) { return createApplicationElementAdapter(); } @@ -308,6 +312,20 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet Container</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.MSnippetContainer + * @generated + */ + public Adapter createSnippetContainerAdapter() { + return null; + } + + /** * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.MApplicationElement <em>Element</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/util/UiSwitch.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java index 9820e4ff6f3..07b2caa889f 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java @@ -110,12 +110,6 @@ public class UiSwitch<T1> extends Switch<T1> { if (result == null) result = defaultCase(theEObject); return result; } - case UiPackageImpl.UI_LABEL: { - MUILabel uiLabel = (MUILabel)theEObject; - T1 result = caseUILabel(uiLabel); - if (result == null) result = defaultCase(theEObject); - return result; - } case UiPackageImpl.ELEMENT_CONTAINER: { MElementContainer<?> elementContainer = (MElementContainer<?>)theEObject; T1 result = caseElementContainer(elementContainer); @@ -124,6 +118,12 @@ public class UiSwitch<T1> extends Switch<T1> { if (result == null) result = defaultCase(theEObject); return result; } + case UiPackageImpl.UI_LABEL: { + MUILabel uiLabel = (MUILabel)theEObject; + T1 result = caseUILabel(uiLabel); + if (result == null) result = defaultCase(theEObject); + return result; + } case UiPackageImpl.GENERIC_STACK: { MGenericStack<?> genericStack = (MGenericStack<?>)theEObject; T1 result = caseGenericStack(genericStack); @@ -166,6 +166,12 @@ public class UiSwitch<T1> extends Switch<T1> { if (result == null) result = defaultCase(theEObject); return result; } + case UiPackageImpl.SNIPPET_CONTAINER: { + MSnippetContainer snippetContainer = (MSnippetContainer)theEObject; + T1 result = caseSnippetContainer(snippetContainer); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -336,6 +342,21 @@ public class UiSwitch<T1> extends Switch<T1> { } /** + * Returns the result of interpreting the object as an instance of '<em>Snippet Container</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>Snippet Container</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSnippetContainer(MSnippetContainer object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>Element</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.java index 0ef9d729448..6f000f1ffa8 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationAdapterFactory.java @@ -23,6 +23,7 @@ import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorConta import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl; import org.eclipse.e4.ui.model.application.ui.MContext; import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions; import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions; @@ -153,6 +154,10 @@ public class ApplicationAdapterFactory extends AdapterFactoryImpl { return createTrimContributionsAdapter(); } @Override + public Adapter caseSnippetContainer(MSnippetContainer object) { + return createSnippetContainerAdapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -397,6 +402,20 @@ public class ApplicationAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet Container</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.MSnippetContainer + * @generated + */ + public Adapter createSnippetContainerAdapter() { + return null; + } + + /** * Creates a new adapter for the default case. * <!-- begin-user-doc --> * This default implementation returns null. diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.java index 5692b0ee53f..2555ff84a1d 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/util/ApplicationSwitch.java @@ -23,6 +23,7 @@ import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorConta import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl; import org.eclipse.e4.ui.model.application.ui.MContext; import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions; import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions; @@ -106,6 +107,7 @@ public class ApplicationSwitch<T1> extends Switch<T1> { if (result == null) result = caseMenuContributions(application); if (result == null) result = caseToolBarContributions(application); if (result == null) result = caseTrimContributions(application); + if (result == null) result = caseSnippetContainer(application); if (result == null) result = caseUIElement(application); if (result == null) result = caseApplicationElement(application); if (result == null) result = defaultCase(theEObject); @@ -383,6 +385,21 @@ public class ApplicationSwitch<T1> extends Switch<T1> { } /** + * Returns the result of interpreting the object as an instance of '<em>Snippet Container</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>Snippet Container</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T1 caseSnippetContainer(MSnippetContainer object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc --> * This implementation returns null; diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java index 7507649b967..ffadfb8e3d9 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java @@ -22,6 +22,7 @@ import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.model.application.MApplicationElement; import org.eclipse.e4.ui.model.application.ui.MElementContainer; import org.eclipse.e4.ui.model.application.ui.MGenericTile; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.advanced.MAdvancedFactory; @@ -247,12 +248,12 @@ public class ModelServiceImpl implements EModelService { * @see org.eclipse.e4.ui.workbench.modeling.EModelService#cloneElement(org.eclipse.e4.ui.model. * application.ui.MUIElement, java.lang.String) */ - public MUIElement cloneElement(MUIElement element, MUIElement snippetContainer) { + public MUIElement cloneElement(MUIElement element, MSnippetContainer snippetContainer) { EObject eObj = (EObject) element; MUIElement clone = (MUIElement) EcoreUtil.copy(eObj); if (snippetContainer != null) { - snippetContainer.getClonableSnippets().add(clone); + snippetContainer.getSnippets().add(clone); } return clone; @@ -264,12 +265,12 @@ public class ModelServiceImpl implements EModelService { * @see org.eclipse.e4.ui.workbench.modeling.EModelService#cloneSnippet(org.eclipse.e4.ui.model. * application.MApplication, java.lang.String) */ - public MUIElement cloneSnippet(MUIElement snippetContainer, String snippetId) { + public MUIElement cloneSnippet(MSnippetContainer snippetContainer, String snippetId) { if (snippetContainer == null || snippetId == null || snippetId.length() == 0) return null; MApplicationElement elementToClone = null; - for (MApplicationElement snippet : snippetContainer.getClonableSnippets()) { + for (MApplicationElement snippet : snippetContainer.getSnippets()) { if (snippetId.equals(snippet.getElementId())) { elementToClone = snippet; break; @@ -286,6 +287,25 @@ public class ModelServiceImpl implements EModelService { /* * (non-Javadoc) * + * @see org.eclipse.e4.ui.workbench.modeling.EModelService#findSnippet(org.eclipse.e4.ui.model. + * application.ui.MSnippetContainer, java.lang.String) + */ + public MUIElement findSnippet(MSnippetContainer snippetContainer, String id) { + if (snippetContainer == null || id == null || id.length() == 0) + return null; + + List<MUIElement> snippets = snippetContainer.getSnippets(); + for (MUIElement snippet : snippets) { + if (id.equals(snippet.getElementId())) + return snippet; + } + + return null; + } + + /* + * (non-Javadoc) + * * @see * org.eclipse.e4.ui.workbench.modeling.EModelService#bringToTop(org.eclipse.e4.ui.model.application * .ui.MUIElement) diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/XMLModelReconciler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/XMLModelReconciler.java index 46956b8c393..de5ba19f37f 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/XMLModelReconciler.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/XMLModelReconciler.java @@ -1882,14 +1882,14 @@ public class XMLModelReconciler extends ModelReconciler { private static boolean isChainedReference(String featureName) { // an ElementContainer has multiple children return featureName.equals(ELEMENTCONTAINER_CHILDREN_ATTNAME) || - // a BindingContainer has multiple bindings + // a BindingContainer has multiple bindings featureName.equals(BINDINGTABLE_BINDINGS_ATTNAME) || // a Part has multiple menus featureName.equals(PART_MENUS_ATTNAME) || // an Application has multiple commands featureName.equals(APPLICATION_COMMANDS_ATTNAME) || - // an ApplicationElement has multiple clonable snippets - featureName.equals(APPLICATIONELEMENT_CLONABLE_SNIPPETS_ATTNAME) || + // a SnippetContainer has multiple snippets + featureName.equals(SNIPPETCONTAINER_SNIPPETS_ATTNAME) || // a HandlerContainer has multiple handlers featureName.equals(HANDLERCONTAINER_HANDLERS_ATTNAME) || // a BindingContainer has multiple binding tables diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EModelService.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EModelService.java index 7f5cf720e63..db9d98601b3 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EModelService.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EModelService.java @@ -14,6 +14,7 @@ package org.eclipse.e4.ui.workbench.modeling; import java.util.List; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; 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.advanced.MPerspective; @@ -166,7 +167,7 @@ public interface EModelService { * need not be saved * @return The newly cloned element */ - public MUIElement cloneElement(MUIElement element, MUIElement snippetContainer); + public MUIElement cloneElement(MUIElement element, MSnippetContainer snippetContainer); /** * If a snippet with the given id exists a clone is created and returned. returns @@ -178,7 +179,18 @@ public interface EModelService { * The element id of the snippet to clone * @return The cloned snippet or <code>null</code> if no snippet with the given id can be found */ - public MUIElement cloneSnippet(MUIElement snippetContainer, String snippetId); + public MUIElement cloneSnippet(MSnippetContainer snippetContainer, String snippetId); + + /** + * Convenience method to find a snippet by id in a particular container + * + * @param snippetContainer + * The container to look in + * @param id + * The id of the root element of the snippet + * @return The root element of the snippet or <code>null</code> if none is found + */ + public MUIElement findSnippet(MSnippetContainer snippetContainer, String id); /** * Return the count of the children whose 'toBeRendered' flag is true diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/ModelReconciler.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/ModelReconciler.java index 130976f2b4b..b4d6e7d690b 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/ModelReconciler.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/ModelReconciler.java @@ -36,8 +36,8 @@ public abstract class ModelReconciler { /** * Attribute defined by MApplicationElements (value is <code>clonableSnippets</code>). */ - public static final String APPLICATIONELEMENT_CLONABLE_SNIPPETS_ATTNAME = ApplicationPackageImpl.eINSTANCE - .getApplicationElement_ClonableSnippets().getName(); + public static final String SNIPPETCONTAINER_SNIPPETS_ATTNAME = UiPackageImpl.eINSTANCE + .getSnippetContainer_Snippets().getName(); /** * Attribute defined by MApplications (value is <code>commands</code>). diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java index 2d6d43e7a0f..7cfc1b52424 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveRegistry.java @@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler; import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker; import org.eclipse.e4.ui.model.application.MApplication; -import org.eclipse.e4.ui.model.application.MApplicationElement; +import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.ui.IPerspectiveDescriptor; @@ -60,8 +60,8 @@ public class PerspectiveRegistry implements IPerspectiveRegistry, IExtensionChan descriptors.put(id, new PerspectiveDescriptor(id, label, element)); } - List<MApplicationElement> snippets = application.getClonableSnippets(); - for (MApplicationElement snippet : snippets) { + List<MUIElement> snippets = application.getSnippets(); + for (MUIElement snippet : snippets) { if (snippet instanceof MPerspective) { MPerspective perspective = (MPerspective) snippet; String id = perspective.getElementId(); |
