Merge pull request #2752 from akurtakov/develop

Create MPart via EModelService

Author: eselmeister

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.ui/src/org/eclipse/chemclipse/ux/extension/ui/provider/ISupplierFileEditorSupport.java

@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2025 Lablicate GmbH.
+ * Copyright (c) 2017, 2026 Lablicate GmbH.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  * Philip Wenig - initial API and implementation
  * Christoph Läubrich - migrate from InputPart to Part
@@ -37,7 +37,6 @@
 import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD;
 import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 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;
@@ -141,7 +140,7 @@ default void openEditor(File file, Object object, String elementId, String contr
 				/*
 				 * Create the input part and prepare it.
 				 */
-				MPart part = MBasicFactory.INSTANCE.createPart();
+				MPart part = modelService.createModelElement(MPart.class);
 				part.getTags().add(EPartService.REMOVE_ON_HIDE_TAG);
 				part.setElementId(elementId);
 				part.setContributionURI(contributionURI);

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/ExtendedChromatogramOverlayUI.java

@@ -6,7 +6,7 @@
  * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  * Philip Wenig - initial API and implementation
  * Christoph Läubrich - support for configuration, zoom lock
@@ -84,7 +84,6 @@
 import org.eclipse.chemclipse.wsd.model.xwc.IExtractedWavelengthSignal;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 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.workbench.modeling.EModelService;
@@ -467,7 +466,7 @@ private void createNewPart(String bundle, String classPath, String name) {
 			EPartService partService = Activator.getDefault().getPartService();
 
 			if(modelService != null && application != null && partService != null) {
-				MPart part = MBasicFactory.INSTANCE.createPart();
+				MPart part = modelService.createModelElement(MPart.class);
 				part.setLabel(name);
 				part.setCloseable(true);
 				part.setContributionURI("bundleclass://" + bundle + "/" + classPath);
@@ -1350,7 +1349,7 @@ private Color getColorTIC(Color colorDefault) {
 
 	/**
 	 * Return the selected derivative or NONE as a default.
-	 * 
+	 *
 	 * @return {@link Derivative}
 	 */
 	private Derivative getSelectedDerivative() {

chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/ExtendedMassSpectrumOverlayUI.java

@@ -6,7 +6,7 @@
  * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  * Philip Wenig - initial API and implementation
  * Matthias Mailänder - adapted for MALDI
@@ -36,7 +36,6 @@
 import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferencePageOverlay;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceSupplier;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory;
 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.workbench.modeling.EModelService;
@@ -316,7 +315,7 @@ private void createNewPart(String bundle, String classPath, String name) {
 		EPartService partService = Activator.getDefault().getPartService();
 
 		if(modelService != null && application != null && partService != null) {
-			MPart part = MBasicFactory.INSTANCE.createPart();
+			MPart part = modelService.createModelElement(MPart.class);
 			part.setLabel(name);
 			part.setCloseable(true);
 			part.setContributionURI("bundleclass://" + bundle + "/" + classPath);