Bug 416082 - PartServiceImpl should use EModelService for model object
creation instead of BasicFactoryImpl
Change-Id: I34327e77b4e3e738398b900656906ef7d469d68c
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
index 98c4a8e..49a458d 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/PartServiceImpl.java
@@ -7,6 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
+ * Lars Vogel (Lars.Vogel@gmail.com) - Bug 416082
******************************************************************************/
package org.eclipse.e4.ui.internal.workbench;
@@ -43,7 +44,6 @@
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
import org.eclipse.e4.ui.services.EContextService;
import org.eclipse.e4.ui.services.IServiceConstants;
@@ -666,8 +666,7 @@
if (descriptor == null) {
return null;
}
-
- MPart part = BasicFactoryImpl.eINSTANCE.createPart();
+ MPart part = modelService.createModelElement(MPart.class);
part.setElementId(descriptor.getElementId());
part.getMenus().addAll(EcoreUtil.copyAll(descriptor.getMenus()));
if (descriptor.getToolbar() != null) {
@@ -897,18 +896,18 @@
MElementContainer<MUIElement> searchRoot = getContainer();
List<MUIElement> children = searchRoot.getChildren();
if (children.size() == 0) {
- MPartStack stack = BasicFactoryImpl.eINSTANCE.createPartStack();
+ MPartStack stack = modelService.createModelElement(MPartStack.class);
searchRoot.getChildren().add(stack);
return stack;
}
MElementContainer<?> lastContainer = getLastContainer(searchRoot, children);
if (lastContainer == null) {
- MPartStack stack = BasicFactoryImpl.eINSTANCE.createPartStack();
+ MPartStack stack = modelService.createModelElement(MPartStack.class);
searchRoot.getChildren().add(stack);
return stack;
} else if (!(lastContainer instanceof MPartStack)) {
- MPartStack stack = BasicFactoryImpl.eINSTANCE.createPartStack();
+ MPartStack stack = modelService.createModelElement(MPartStack.class);
((List) lastContainer.getChildren()).add(stack);
return stack;
}
