aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-12-11 09:27:22 (EST)
committerGerrit Code Review @ Eclipse.org2013-12-11 14:38:12 (EST)
commit631e70ceac254c4af4818aa6b46d20818dabf9e6 (patch)
tree2b682e2f526f98f887a20d95cc84baefa123f1ef
parent05044a55787792abee37f4adaef63c63198bbae5 (diff)
downloadeclipse.platform.ui-631e70ceac254c4af4818aa6b46d20818dabf9e6.zip
eclipse.platform.ui-631e70ceac254c4af4818aa6b46d20818dabf9e6.tar.gz
eclipse.platform.ui-631e70ceac254c4af4818aa6b46d20818dabf9e6.tar.bz2
bug 419888: [Model] [API] Extend the EModelService#createModelElement(*)I20131211-2000refs/changes/49/19649/2
to read EMF extensions Update Javadoc to reflect the current implementation. Change-Id: Idc593d3d6cc6099bc543eb4dcf66be4801cc1716
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java7
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EModelService.java58
2 files changed, 10 insertions, 55 deletions
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 9650993..0222a1a 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
@@ -106,9 +106,10 @@ public class ModelServiceImpl implements EModelService {
appContext.get(IExtensionRegistry.class));
}
- /**
- * @see EModelService#createModelElement(Class)
- * @generated
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.e4.ui.workbench.modeling.EModelService#createModelElement(java.lang.Class)
*/
@SuppressWarnings("unchecked")
public final <T extends MApplicationElement> T createModelElement(Class<T> elementType) {
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 40cd85a..857533c 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
@@ -92,62 +92,16 @@ public interface EModelService {
public static String CLONED_FROM_KEY = "Cloned From"; //$NON-NLS-1$
/**
- * Creates instances of model elements. Supported types are
- * <ul>
- * <li>{@link org.eclipse.e4.ui.model.application.MAddon MAddon}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.MApplication MApplication}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.MArea MArea}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MBindingContext MBindingContext}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MBindingTable MBindingTable}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MCategory MCategory}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MCommand MCommand}</li>
- * <li>
- * {@link org.eclipse.e4.ui.model.application.commands.MCommandParameter MCommandParameter}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MCompositePart MCompositePart}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.MCoreExpression MCoreExpression}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem MDirectMenuItem}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem MDirectToolItem}</li>
- * <li>
- * {@link org.eclipse.e4.ui.model.application.ui.menu.MDynamicMenuContribution
- * MDynamicMenuContribution}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem MHandledMenuItem}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem MHandledToolItem}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MHandler MHandler}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MInputPart MInputPart}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MKeyBinding MKeyBinding}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MMenu MMenu}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution MMenuContribution}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator MMenuSeparator}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.commands.MParameter MParameter}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MPart MPart}</li>
- * <li>
- * {@link org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor MPartDescriptor}</li>
- * <li>
- * {@link org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer MPartSashContainer}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MPartStack MPartStack}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.MPerspective MPerspective}</li>
- * <li>
- * {@link org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack MPerspectiveStack}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder MPlaceholder}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MPopupMenu MPopupMenu}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MToolBar MToolBar}</li>
- * <li>
- * {@link org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution MToolBarContribution}
- * </li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator MToolBarSeparator}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MToolControl MToolControl}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimBar MTrimBar}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.menu.MTrimContribution MTrimContribution}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow MTrimmedWindow}</li>
- * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.MWindow MWindow}</li>
- * </ul>
+ * Creates instances of model elements. The method supports any type extending
+ * {@link MApplicationElement}, both in the standard e4 UI model and in an extension models.
*
* @param elementType
- * the class to instantiate
- * @return a new instance or <code>null</code>
+ * the class to instantiate. Cannot be <code>null</code>
+ * @return a new instance
+ * @throws NullPointerException
+ * if the passed class is <code>null</code>
* @throws IllegalArgumentException
* if the passed class is not supported.
- * @generated
*/
public <T extends MApplicationElement> T createModelElement(Class<T> elementType);