Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Descher2013-03-23 07:24:38 -0400
committerGerrit Code Review @ Eclipse.org2013-03-23 17:16:40 -0400
commit9a84a8a9b45dd6f28656b07f25d47df9815b3901 (patch)
treefc062f3ce856759845924d756ff1133327227410
parent952e0141433459dbe804751f031f256414039dc6 (diff)
downloadorg.eclipse.e4.tools-9a84a8a9b45dd6f28656b07f25d47df9815b3901.tar.gz
org.eclipse.e4.tools-9a84a8a9b45dd6f28656b07f25d47df9815b3901.tar.xz
org.eclipse.e4.tools-9a84a8a9b45dd6f28656b07f25d47df9815b3901.zip
[404207] Missing DynamicMenuContribution in child selector
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties4
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java2
-rw-r--r--bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java2
4 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 22189a5f..6f8e3005 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -135,6 +135,7 @@ public class Messages {
public String MenuEditor_MenuItemType;
public String MenuEditor_MenuItemItemType;
public String MenuEditor_HandledMenuItem;
+ public String MenuEditor_DynamicMenuContribution;
public String MenuEditor_Separator;
public String MenuEditor_Menu;
public String MenuEditor_DirectMenuItem;
@@ -287,6 +288,7 @@ public class Messages {
public String MenuContributionEditor_MenuItemType;
public String MenuContributionEditor_MenuItemItemType;
public String MenuContributionEditor_HandledMenuItem;
+ public String MenuContributionEditor_DynamicMenuContribution;
public String MenuContributionEditor_Separator;
public String MenuContributionEditor_Menu;
public String MenuContributionEditor_DirectMenuItem;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index 2ef6d0c4..f39ae0e7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -134,6 +134,7 @@ MenuEditor_MenuItems=MenuItems
MenuEditor_MenuItemType=Type
MenuEditor_MenuItemItemType=Item Type
MenuEditor_HandledMenuItem=Handled MenuItem
+MenuEditor_DynamicMenuContribution=DynamicMenuContribution
MenuEditor_Separator=Separator
MenuEditor_Menu=Menu
MenuEditor_DirectMenuItem=Direct MenuItem
@@ -289,6 +290,7 @@ MenuContributionEditor_MenuItems=Menu Items
MenuContributionEditor_MenuItemType=Type
MenuContributionEditor_MenuItemItemType=Item Type
MenuContributionEditor_HandledMenuItem=Handled MenuItem
+MenuContributionEditor_DynamicMenuContribution=DynamicMenuContribution
MenuContributionEditor_Separator=Separator
MenuContributionEditor_Menu=Menu
MenuContributionEditor_DirectMenuItem=Direct MenuItem
@@ -632,4 +634,4 @@ Special_UnknownElement_Detail= Use an extension point!
VWindowSharedElementsEditor_Area=Area
ModelEditor_ExtractFragment=Extract into a fragment
ModelEditor_ExtractFragment_NoParentId=Can not extract because parent container has no id. \nAdd an id and try again.
-KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters \ No newline at end of file
+KeyBindingEditor_SequenceLowercase=Key sequences should be specified in uppercase characters
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
index f8b610fd..506f3f03 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuContributionEditor.java
@@ -296,7 +296,7 @@ public class MenuContributionEditor extends AbstractComponentEditor {
});
Struct defaultStruct = new Struct(Messages.MenuContributionEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
- childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+ childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuContributionEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuContributionEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuContributionEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuContributionEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
index 98545578..d90482b1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuEditor.java
@@ -278,7 +278,7 @@ public class MenuEditor extends AbstractComponentEditor {
});
Struct defaultStruct = new Struct(Messages.MenuEditor_HandledMenuItem, MenuPackageImpl.Literals.HANDLED_MENU_ITEM, false);
- childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false) });
+ childrenDropDown.setInput(new Struct[] { new Struct(Messages.MenuEditor_Separator, MenuPackageImpl.Literals.MENU_SEPARATOR, true), new Struct(Messages.MenuEditor_Menu, MenuPackageImpl.Literals.MENU, false), defaultStruct, new Struct(Messages.MenuEditor_DirectMenuItem, MenuPackageImpl.Literals.DIRECT_MENU_ITEM, false), new Struct(Messages.MenuEditor_DynamicMenuContribution, MenuPackageImpl.Literals.DYNAMIC_MENU_CONTRIBUTION, false) });
childrenDropDown.setSelection(new StructuredSelection(defaultStruct));
Button b = new Button(buttonComp, SWT.PUSH | SWT.FLAT);

Back to the top