Bug 482589 - Show Snippets also below MWindow in the e4 model editor
Change-Id: Iffe83dc506fceb509cd7dd4847d341032759296a
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
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 65e1f1b..178cbac 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
@@ -483,6 +483,7 @@
public String WindowEditor_Windows;
public String WindowEditor_Controls;
public String WindowEditor_SharedElements;
+ public String WindowEditor_Snippets;
public String VApplicationAddons_AddAddon;
public String VApplicationAddons_TreeLabel;
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 1fa6c0d..0b0bd77 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
@@ -460,6 +460,7 @@
WindowEditor_Windows=Windows and Dialogs
WindowEditor_Controls=Controls
WindowEditor_SharedElements=Shared Elements
+WindowEditor_Snippets=Snippets
VApplicationAddons_AddAddon=Add-on
VApplicationAddons_TreeLabel=Add-ons
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
index 2488267..7fd44dc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/ModelEditor.java
@@ -272,6 +272,8 @@
public static final String VIRTUAL_TRIM_CONTRIBUTIONS = ModelEditor.class.getName() + ".VIRTUAL_TRIM_CONTRIBUTIONS"; //$NON-NLS-1$
public static final String VIRTUAL_WINDOW_SHARED_ELEMENTS = ModelEditor.class.getName()
+ ".VIRTUAL_WINDOW_SHARED_ELEMENTS"; //$NON-NLS-1$
+ public static final String VIRTUAL_WINDOW_SNIPPETS = ModelEditor.class.getName() + ".VIRTUAL_WINDOW_SNIPPETS"; //$NON-NLS-1$
+
public static final String VIRTUAL_MODEL_FRAGEMENTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_FRAGEMENTS"; //$NON-NLS-1$
public static final String VIRTUAL_MODEL_IMPORTS = ModelEditor.class.getName() + ".VIRTUAL_MODEL_IMPORTS"; //$NON-NLS-1$
public static final String VIRTUAL_CATEGORIES = ModelEditor.class.getName() + ".VIRTUAL_CATEGORIES"; //$NON-NLS-1$
@@ -1209,6 +1211,7 @@
ContextInjectionFactory.make(VPerspectiveWindowsEditor.class, context));
registerVirtualEditor(VIRTUAL_WINDOW_CONTROLS,
ContextInjectionFactory.make(VWindowControlEditor.class, context));
+ registerVirtualEditor(VIRTUAL_WINDOW_SNIPPETS, ContextInjectionFactory.make(VSnippetsEditor.class, context));
registerVirtualEditor(VIRTUAL_PART_DESCRIPTORS, ContextInjectionFactory.make(VPartDescriptor.class, context));
registerVirtualEditor(VIRTUAL_PARTDESCRIPTOR_MENU,
ContextInjectionFactory.make(VPartDescriptorMenuEditor.class, context));
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
index d8ec12a..c4bc295 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/WindowEditor.java
@@ -82,6 +82,7 @@
private final IListProperty ELEMENT_CONTAINER__CHILDREN = EMFProperties
.list(UiPackageImpl.Literals.ELEMENT_CONTAINER__CHILDREN);
private final IListProperty SHARED_ELEMENTS = EMFProperties.list(BasicPackageImpl.Literals.WINDOW__SHARED_ELEMENTS);
+ private final IListProperty SNIPPETS = EMFProperties.list(UiPackageImpl.Literals.SNIPPET_CONTAINER__SNIPPETS);
private final IValueProperty WINDOW__MAIN_MENU = EMFProperties.value(BasicPackageImpl.Literals.WINDOW__MAIN_MENU);
private Action addMainMenu;
@@ -408,6 +409,14 @@
}
});
+ list.add(new VirtualEntry<Object>(ModelEditor.VIRTUAL_WINDOW_SNIPPETS, SNIPPETS, element,
+ Messages.WindowEditor_Snippets) {
+ @Override
+ protected boolean accepted(Object o) {
+ return true;
+ }
+ });
+
final MWindow window = (MWindow) element;
if (window.getMainMenu() != null) {
list.add(0, window.getMainMenu());
