diff options
author | Olivier Prouvost | 2018-02-06 18:27:19 +0000 |
---|---|---|
committer | Olivier Prouvost | 2018-02-13 15:25:00 +0000 |
commit | e42201495b5a269ccdd5da3dc3ba1bd895d52169 (patch) | |
tree | ffd6a1ad745af5fcfe64129de3b088dc2d21fa16 | |
parent | 6179a690915e28309dd3849a894e0d0e64f7705a (diff) | |
download | eclipse.platform.ui-e42201495b5a269ccdd5da3dc3ba1bd895d52169.tar.gz eclipse.platform.ui-e42201495b5a269ccdd5da3dc3ba1bd895d52169.tar.xz eclipse.platform.ui-e42201495b5a269ccdd5da3dc3ba1bd895d52169.zip |
Bug 509868 - Mark MInput and MInputPart for deletion
Add @noreference @noimplement or @noextend with comment to the bug.
Change-Id: I079f7ad1d96b2d5424173892b6f178f4b6cb8c16
Signed-off-by: Olivier Prouvost <olivier.prouvost@opcoach.com>
20 files changed, 1550 insertions, 1280 deletions
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.java index b1a7fb6a198..58017c4c5fd 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.java @@ -51,13 +51,16 @@ public interface MBasicFactory { MCompositePart createCompositePart(); /** - * Returns a new object of class '<em>Input Part</em>'. - * <!-- begin-user-doc --> + * Returns a new object of class '<em>Input Part</em>'. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @return a new object of class '<em>Input Part</em>'. * @since 1.0 - * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @deprecated See {@link MInputPart model documentation} for details + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + * @generated NOT + * @noreference This method is not intended to be referenced by clients. */ @Deprecated MInputPart createInputPart(); diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MInputPart.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MInputPart.java index 5c748ca9710..0d603179dd3 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MInputPart.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MInputPart.java @@ -13,25 +13,32 @@ package org.eclipse.e4.ui.model.application.ui.basic; import org.eclipse.e4.ui.model.application.ui.MInput; /** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Input Part</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> A representation of the model object '<em><b>Input + * Part</b></em>'. <!-- end-user-doc --> * * <!-- begin-model-doc --> * <p> - * This is a subclass of Part that allows tracking of an 'input'. While originally defined as - * a type of 'editor' it turns out that it may well be better to just use a regular Part and - * to store what would be the input as an entry on the Part's 'persistentData' map. + * This is a subclass of Part that allows tracking of an 'input'. While + * originally defined as a type of 'editor' it turns out that it may well be + * better to just use a regular Part and to store what would be the input as an + * entry on the Part's 'persistentData' map. * </p> + * * @since 1.0 * @deprecated Use Part instead. * @noimplement This interface is not intended to be implemented by clients. - * <!-- end-model-doc --> + * <!-- end-model-doc --> * * * @model - * @generated + * @generated NOT + * @noreference + * @noextend This interface is not intended to be extended by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + * */ @Deprecated + public interface MInputPart extends MPart, MInput { } // MInputPart diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.java index d54dcbe2a2c..2d4fa1754ef 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.java @@ -10,7 +10,17 @@ */ package org.eclipse.e4.ui.model.application.ui.basic.impl; -import org.eclipse.e4.ui.model.application.ui.basic.*; +import org.eclipse.e4.ui.model.application.ui.basic.MBasicFactory; +import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart; +import org.eclipse.e4.ui.model.application.ui.basic.MDialog; +import org.eclipse.e4.ui.model.application.ui.basic.MInputPart; +import org.eclipse.e4.ui.model.application.ui.basic.MPart; +import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer; +import org.eclipse.e4.ui.model.application.ui.basic.MPartStack; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow; +import org.eclipse.e4.ui.model.application.ui.basic.MWindow; +import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -70,18 +80,17 @@ public class BasicFactoryImpl extends EFactoryImpl implements MBasicFactory { @Override public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { - case BasicPackageImpl.PART: return (EObject)createPart(); - case BasicPackageImpl.COMPOSITE_PART: return (EObject)createCompositePart(); - case BasicPackageImpl.INPUT_PART: return (EObject)createInputPart(); - case BasicPackageImpl.PART_STACK: return (EObject)createPartStack(); - case BasicPackageImpl.PART_SASH_CONTAINER: return (EObject)createPartSashContainer(); - case BasicPackageImpl.WINDOW: return (EObject)createWindow(); - case BasicPackageImpl.TRIMMED_WINDOW: return (EObject)createTrimmedWindow(); - case BasicPackageImpl.TRIM_BAR: return (EObject)createTrimBar(); - case BasicPackageImpl.DIALOG: return (EObject)createDialog(); - case BasicPackageImpl.WIZARD_DIALOG: return (EObject)createWizardDialog(); - default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + case BasicPackageImpl.PART: return (EObject)createPart(); + case BasicPackageImpl.COMPOSITE_PART: return (EObject)createCompositePart(); + case BasicPackageImpl.PART_STACK: return (EObject)createPartStack(); + case BasicPackageImpl.PART_SASH_CONTAINER: return (EObject)createPartSashContainer(); + case BasicPackageImpl.WINDOW: return (EObject)createWindow(); + case BasicPackageImpl.TRIMMED_WINDOW: return (EObject)createTrimmedWindow(); + case BasicPackageImpl.TRIM_BAR: return (EObject)createTrimBar(); + case BasicPackageImpl.DIALOG: return (EObject)createDialog(); + case BasicPackageImpl.WIZARD_DIALOG: return (EObject)createWizardDialog(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } @@ -108,11 +117,16 @@ public class BasicFactoryImpl extends EFactoryImpl implements MBasicFactory { } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @nooverride This method is not intended to be re-implemented or extended by + * clients. + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public MInputPart createInputPart() { diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java index a889990515c..46b823fb1d9 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java @@ -100,19 +100,6 @@ public class BasicPackageImpl extends EPackageImpl { public static final int PART = 0; /** - * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl <em>Input Part</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl - * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl#getInputPart() - * @since 1.0 - * @deprecated See {@link MInputPart model documentation} for details. - * @generated - */ - @Deprecated - public static final int INPUT_PART = 2; - - /** * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartStackImpl <em>Part Stack</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1015,398 +1002,515 @@ public class BasicPackageImpl extends EPackageImpl { public static final int COMPOSITE_PART_OPERATION_COUNT = PART_OPERATION_COUNT + 0; /** - * The feature id for the '<em><b>Element Id</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Element Id</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__ELEMENT_ID = PART__ELEMENT_ID; /** - * The feature id for the '<em><b>Persisted State</b></em>' map. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Persisted State</b></em>' map. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__PERSISTED_STATE = PART__PERSISTED_STATE; /** - * The feature id for the '<em><b>Tags</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Tags</b></em>' attribute list. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__TAGS = PART__TAGS; /** - * The feature id for the '<em><b>Contributor URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Contributor URI</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__CONTRIBUTOR_URI = PART__CONTRIBUTOR_URI; /** - * The feature id for the '<em><b>Transient Data</b></em>' map. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Transient Data</b></em>' map. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__TRANSIENT_DATA = PART__TRANSIENT_DATA; /** - * The feature id for the '<em><b>Widget</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Widget</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__WIDGET = PART__WIDGET; /** - * The feature id for the '<em><b>Renderer</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Renderer</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__RENDERER = PART__RENDERER; /** - * The feature id for the '<em><b>To Be Rendered</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>To Be Rendered</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__TO_BE_RENDERED = PART__TO_BE_RENDERED; /** - * The feature id for the '<em><b>On Top</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>On Top</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__ON_TOP = PART__ON_TOP; /** - * The feature id for the '<em><b>Visible</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Visible</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__VISIBLE = PART__VISIBLE; /** - * The feature id for the '<em><b>Parent</b></em>' container reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated * @ordered + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__PARENT = PART__PARENT; /** - * The feature id for the '<em><b>Container Data</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Container Data</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__CONTAINER_DATA = PART__CONTAINER_DATA; /** - * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__CUR_SHARED_REF = PART__CUR_SHARED_REF; /** * The feature id for the '<em><b>Visible When</b></em>' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__VISIBLE_WHEN = PART__VISIBLE_WHEN; /** - * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__ACCESSIBILITY_PHRASE = PART__ACCESSIBILITY_PHRASE; /** - * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Localized Accessibility Phrase</b></em>' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__LOCALIZED_ACCESSIBILITY_PHRASE = PART__LOCALIZED_ACCESSIBILITY_PHRASE; /** - * The feature id for the '<em><b>Contribution URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Contribution URI</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__CONTRIBUTION_URI = PART__CONTRIBUTION_URI; /** - * The feature id for the '<em><b>Object</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Object</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__OBJECT = PART__OBJECT; /** - * The feature id for the '<em><b>Context</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Context</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__CONTEXT = PART__CONTEXT; /** - * The feature id for the '<em><b>Variables</b></em>' attribute list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Variables</b></em>' attribute list. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__VARIABLES = PART__VARIABLES; /** - * The feature id for the '<em><b>Properties</b></em>' map. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Properties</b></em>' map. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__PROPERTIES = PART__PROPERTIES; /** - * The feature id for the '<em><b>Label</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Label</b></em>' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__LABEL = PART__LABEL; /** - * The feature id for the '<em><b>Icon URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Icon URI</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__ICON_URI = PART__ICON_URI; /** - * The feature id for the '<em><b>Tooltip</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__TOOLTIP = PART__TOOLTIP; /** - * The feature id for the '<em><b>Localized Label</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Localized Label</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__LOCALIZED_LABEL = PART__LOCALIZED_LABEL; /** - * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Localized Tooltip</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__LOCALIZED_TOOLTIP = PART__LOCALIZED_TOOLTIP; /** * The feature id for the '<em><b>Handlers</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__HANDLERS = PART__HANDLERS; /** - * The feature id for the '<em><b>Dirty</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Dirty</b></em>' attribute. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__DIRTY = PART__DIRTY; /** * The feature id for the '<em><b>Binding Contexts</b></em>' reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__BINDING_CONTEXTS = PART__BINDING_CONTEXTS; /** * The feature id for the '<em><b>Menus</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__MENUS = PART__MENUS; /** - * The feature id for the '<em><b>Toolbar</b></em>' containment reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Toolbar</b></em>' containment reference. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__TOOLBAR = PART__TOOLBAR; /** - * The feature id for the '<em><b>Closeable</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Closeable</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__CLOSEABLE = PART__CLOSEABLE; /** - * The feature id for the '<em><b>Description</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Description</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__DESCRIPTION = PART__DESCRIPTION; /** * The feature id for the '<em><b>Localized Description</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__LOCALIZED_DESCRIPTION = PART__LOCALIZED_DESCRIPTION; /** - * The feature id for the '<em><b>Trim Bars</b></em>' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Trim Bars</b></em>' containment reference + * list. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.3 - * </p> - * @generated + * </p> + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART__TRIM_BARS = PART__TRIM_BARS; /** - * The feature id for the '<em><b>Input URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Input URI</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT_PART__INPUT_URI = PART_FEATURE_COUNT + 0; /** - * The number of structural features of the '<em>Input Part</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The number of structural features of the '<em>Input Part</em>' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT_PART_FEATURE_COUNT = PART_FEATURE_COUNT + 1; /** - * The operation id for the '<em>Update Localization</em>' operation. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The operation id for the '<em>Update Localization</em>' operation. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.1 - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public static final int INPUT_PART___UPDATE_LOCALIZATION = PART___UPDATE_LOCALIZATION; /** - * The number of operations of the '<em>Input Part</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The number of operations of the '<em>Input Part</em>' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT_PART_OPERATION_COUNT = PART_OPERATION_COUNT + 0; @@ -4440,11 +4544,14 @@ public class BasicPackageImpl extends EPackageImpl { private EClass compositePartEClass = null; /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated private EClass inputPartEClass = null; @@ -4741,14 +4848,18 @@ public class BasicPackageImpl extends EPackageImpl { /** - * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.basic.MInputPart <em>Input Part</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Returns the meta object for class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MInputPart <em>Input + * Part</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Input Part</em>'. * @see org.eclipse.e4.ui.model.application.ui.basic.MInputPart * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public EClass getInputPart() { @@ -5069,8 +5180,6 @@ public class BasicPackageImpl extends EPackageImpl { compositePartEClass = createEClass(COMPOSITE_PART); - inputPartEClass = createEClass(INPUT_PART); - partStackEClass = createEClass(PART_STACK); partSashContainerEClass = createEClass(PART_SASH_CONTAINER); @@ -5153,8 +5262,6 @@ public class BasicPackageImpl extends EPackageImpl { EGenericType g2 = createEGenericType(this.getPartSashContainerElement()); g1.getETypeArguments().add(g2); compositePartEClass.getEGenericSuperTypes().add(g1); - inputPartEClass.getESuperTypes().add(this.getPart()); - inputPartEClass.getESuperTypes().add(theUiPackage.getInput()); g1 = createEGenericType(theUiPackage.getGenericStack()); g2 = createEGenericType(this.getStackElement()); g1.getETypeArguments().add(g2); @@ -5210,8 +5317,6 @@ public class BasicPackageImpl extends EPackageImpl { initEClass(compositePartEClass, MCompositePart.class, "CompositePart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEClass(inputPartEClass, MInputPart.class, "InputPart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - initEClass(partStackEClass, MPartStack.class, "PartStack", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEClass(partSashContainerEClass, MPartSashContainer.class, "PartSashContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ @@ -5335,18 +5440,24 @@ public class BasicPackageImpl extends EPackageImpl { public static final EClass COMPOSITE_PART = eINSTANCE.getCompositePart(); /** - * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl <em>Input Part</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The meta object literal for the + * '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl + * <em>Input Part</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl#getInputPart() * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + * */ @Deprecated public static final EClass INPUT_PART = eINSTANCE.getInputPart(); + /** * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartStackImpl <em>Part Stack</em>}' class. * <!-- begin-user-doc --> diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/InputPartImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/InputPartImpl.java index 93ac74541e2..235f6ef0156 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/InputPartImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/InputPartImpl.java @@ -1,15 +1,4 @@ -/** - * Copyright (c) 2008, 2015 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - */ package org.eclipse.e4.ui.model.application.ui.basic.impl; - import org.eclipse.e4.ui.model.application.ui.MInput; import org.eclipse.e4.ui.model.application.ui.basic.MInputPart; import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; @@ -18,55 +7,70 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; /** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Input Part</b></em>'. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Input + * Part</b></em>'. <!-- end-user-doc --> * <p> * The following features are implemented: * </p> * <ul> - * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl#getInputURI <em>Input URI</em>}</li> + * <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.InputPartImpl#getInputURI + * <em>Input URI</em>}</li> * </ul> * * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @noextend This class is not intended to be subclassed by clients. + * @noreference This class is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public class InputPartImpl extends PartImpl implements MInputPart { /** - * The default value of the '{@link #getInputURI() <em>Input URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The default value of the '{@link #getInputURI() <em>Input URI</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see #getInputURI() - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ protected static final String INPUT_URI_EDEFAULT = null; - /** - * The cached value of the '{@link #getInputURI() <em>Input URI</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The cached value of the '{@link #getInputURI() <em>Input URI</em>}' + * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see #getInputURI() - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ protected String inputURI = INPUT_URI_EDEFAULT; /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This constructor is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ protected InputPartImpl() { super(); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override protected EClass eStaticClass() { @@ -74,18 +78,24 @@ public class InputPartImpl extends PartImpl implements MInputPart { } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public String getInputURI() { return inputURI; } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ public void setInputURI(String newInputURI) { String oldInputURI = inputURI; @@ -95,109 +105,128 @@ public class InputPartImpl extends PartImpl implements MInputPart { } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case BasicPackageImpl.INPUT_PART__INPUT_URI: - return getInputURI(); + case BasicPackageImpl.INPUT_PART__INPUT_URI: + return getInputURI(); } return super.eGet(featureID, resolve, coreType); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case BasicPackageImpl.INPUT_PART__INPUT_URI: - setInputURI((String)newValue); - return; + case BasicPackageImpl.INPUT_PART__INPUT_URI: + setInputURI((String)newValue); + return; } super.eSet(featureID, newValue); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public void eUnset(int featureID) { switch (featureID) { - case BasicPackageImpl.INPUT_PART__INPUT_URI: - setInputURI(INPUT_URI_EDEFAULT); - return; + case BasicPackageImpl.INPUT_PART__INPUT_URI: + setInputURI(INPUT_URI_EDEFAULT); + return; } super.eUnset(featureID); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public boolean eIsSet(int featureID) { switch (featureID) { - case BasicPackageImpl.INPUT_PART__INPUT_URI: - return INPUT_URI_EDEFAULT == null ? inputURI != null : !INPUT_URI_EDEFAULT.equals(inputURI); + case BasicPackageImpl.INPUT_PART__INPUT_URI: + return INPUT_URI_EDEFAULT == null ? inputURI != null : !INPUT_URI_EDEFAULT.equals(inputURI); } return super.eIsSet(featureID); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) { if (baseClass == MInput.class) { switch (derivedFeatureID) { - case BasicPackageImpl.INPUT_PART__INPUT_URI: return UiPackageImpl.INPUT__INPUT_URI; - default: return -1; + case BasicPackageImpl.INPUT_PART__INPUT_URI: return UiPackageImpl.INPUT__INPUT_URI; + default: return -1; } } return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass); } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) { if (baseClass == MInput.class) { switch (baseFeatureID) { - case UiPackageImpl.INPUT__INPUT_URI: return BasicPackageImpl.INPUT_PART__INPUT_URI; - default: return -1; + case UiPackageImpl.INPUT__INPUT_URI: return BasicPackageImpl.INPUT_PART__INPUT_URI; + default: return -1; } } return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass); } - + /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Override public String toString() { if (eIsProxy()) return super.toString(); - StringBuilder result = new StringBuilder(super.toString()); result.append(" (inputURI: "); //$NON-NLS-1$ result.append(inputURI); result.append(')'); return result.toString(); } - -} //InputPartImpl +} //InputPartImpl
\ No newline at end of file diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java index 8817c8fe059..fad065994f4 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java @@ -25,7 +25,20 @@ import org.eclipse.e4.ui.model.application.ui.MLocalizable; import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.MUILabel; -import org.eclipse.e4.ui.model.application.ui.basic.*; +import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart; +import org.eclipse.e4.ui.model.application.ui.basic.MDialog; +import org.eclipse.e4.ui.model.application.ui.basic.MInputPart; +import org.eclipse.e4.ui.model.application.ui.basic.MPart; +import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer; +import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement; +import org.eclipse.e4.ui.model.application.ui.basic.MPartStack; +import org.eclipse.e4.ui.model.application.ui.basic.MStackElement; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow; +import org.eclipse.e4.ui.model.application.ui.basic.MWindow; +import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement; +import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog; import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -33,27 +46,26 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; /** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides + * an adapter <code>createXXX</code> method for each class of the model. <!-- + * end-user-doc --> + * * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl * @generated */ @SuppressWarnings("deprecation") public class BasicAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected static BasicPackageImpl modelPackage; /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @generated */ public BasicAdapterFactory() { @@ -63,10 +75,11 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. + * Returns whether this factory is applicable for the type of the object. <!-- + * begin-user-doc --> This implementation returns <code>true</code> if the + * object is either the model's package or is an instance object of the model. * <!-- end-user-doc --> + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -76,161 +89,202 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { return true; } if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; + return ((EObject) object).eClass().getEPackage() == modelPackage; } return false; } /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The switch that delegates to the <code>createXXX</code> methods. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @generated */ - protected BasicSwitch<Adapter> modelSwitch = - new BasicSwitch<Adapter>() { - @Override - public Adapter casePart(MPart object) { - return createPartAdapter(); - } - @Override - public Adapter caseCompositePart(MCompositePart object) { - return createCompositePartAdapter(); - } - @Override - public Adapter caseInputPart(MInputPart object) { - return createInputPartAdapter(); - } - @Override - public Adapter casePartStack(MPartStack object) { - return createPartStackAdapter(); - } - @Override - public Adapter casePartSashContainer(MPartSashContainer object) { - return createPartSashContainerAdapter(); - } - @Override - public Adapter caseWindow(MWindow object) { - return createWindowAdapter(); - } - @Override - public Adapter caseTrimmedWindow(MTrimmedWindow object) { - return createTrimmedWindowAdapter(); - } - @Override - public Adapter caseTrimElement(MTrimElement object) { - return createTrimElementAdapter(); - } - @Override - public Adapter casePartSashContainerElement(MPartSashContainerElement object) { - return createPartSashContainerElementAdapter(); - } - @Override - public Adapter caseWindowElement(MWindowElement object) { - return createWindowElementAdapter(); - } - @Override - public Adapter caseTrimBar(MTrimBar object) { - return createTrimBarAdapter(); - } - @Override - public Adapter caseStackElement(MStackElement object) { - return createStackElementAdapter(); - } - @Override - public Adapter caseDialog(MDialog object) { - return createDialogAdapter(); - } - @Override - public Adapter caseWizardDialog(MWizardDialog object) { - return createWizardDialogAdapter(); - } - @Override - public Adapter caseApplicationElement(MApplicationElement object) { - return createApplicationElementAdapter(); - } - @Override - public Adapter caseLocalizable(MLocalizable object) { - return createLocalizableAdapter(); - } - @Override - public Adapter caseUIElement(MUIElement object) { - return createUIElementAdapter(); - } - @Override - public Adapter caseContribution(MContribution object) { - return createContributionAdapter(); - } - @Override - public Adapter caseContext(MContext object) { - return createContextAdapter(); - } - @Override - public Adapter caseUILabel(MUILabel object) { - return createUILabelAdapter(); - } - @Override - public Adapter caseHandlerContainer(MHandlerContainer object) { - return createHandlerContainerAdapter(); - } - @Override - public Adapter caseDirtyable(MDirtyable object) { - return createDirtyableAdapter(); - } - @Override - public Adapter caseBindings(MBindings object) { - return createBindingsAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseElementContainer(MElementContainer<T> object) { - return createElementContainerAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseGenericTile(MGenericTile<T> object) { - return createGenericTileAdapter(); - } - @Override - public Adapter caseInput(MInput object) { - return createInputAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseGenericStack(MGenericStack<T> object) { - return createGenericStackAdapter(); - } - @Override - public Adapter caseSnippetContainer(MSnippetContainer object) { - return createSnippetContainerAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseGenericTrimContainer(MGenericTrimContainer<T> object) { - return createGenericTrimContainerAdapter(); - } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. + protected BasicSwitch<Adapter> modelSwitch = new BasicSwitch<Adapter>() { + @Override + public Adapter casePart(MPart object) { + return createPartAdapter(); + } + + @Override + public Adapter caseCompositePart(MCompositePart object) { + return createCompositePartAdapter(); + } + + /** + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Override + @Deprecated + public Adapter caseInputPart(MInputPart object) { + return createInputPartAdapter(); + } + + @Override + public Adapter casePartStack(MPartStack object) { + return createPartStackAdapter(); + } + + @Override + public Adapter casePartSashContainer(MPartSashContainer object) { + return createPartSashContainerAdapter(); + } + + @Override + public Adapter caseWindow(MWindow object) { + return createWindowAdapter(); + } + + @Override + public Adapter caseTrimmedWindow(MTrimmedWindow object) { + return createTrimmedWindowAdapter(); + } + + @Override + public Adapter caseTrimElement(MTrimElement object) { + return createTrimElementAdapter(); + } + + @Override + public Adapter casePartSashContainerElement(MPartSashContainerElement object) { + return createPartSashContainerElementAdapter(); + } + + @Override + public Adapter caseWindowElement(MWindowElement object) { + return createWindowElementAdapter(); + } + + @Override + public Adapter caseTrimBar(MTrimBar object) { + return createTrimBarAdapter(); + } + + @Override + public Adapter caseStackElement(MStackElement object) { + return createStackElementAdapter(); + } + + @Override + public Adapter caseDialog(MDialog object) { + return createDialogAdapter(); + } + + @Override + public Adapter caseWizardDialog(MWizardDialog object) { + return createWizardDialogAdapter(); + } + + @Override + public Adapter caseApplicationElement(MApplicationElement object) { + return createApplicationElementAdapter(); + } + + @Override + public Adapter caseLocalizable(MLocalizable object) { + return createLocalizableAdapter(); + } + + @Override + public Adapter caseUIElement(MUIElement object) { + return createUIElementAdapter(); + } + + @Override + public Adapter caseContribution(MContribution object) { + return createContributionAdapter(); + } + + @Override + public Adapter caseContext(MContext object) { + return createContextAdapter(); + } + + @Override + public Adapter caseUILabel(MUILabel object) { + return createUILabelAdapter(); + } + + @Override + public Adapter caseHandlerContainer(MHandlerContainer object) { + return createHandlerContainerAdapter(); + } + + @Override + public Adapter caseDirtyable(MDirtyable object) { + return createDirtyableAdapter(); + } + + @Override + public Adapter caseBindings(MBindings object) { + return createBindingsAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseElementContainer(MElementContainer<T> object) { + return createElementContainerAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseGenericTile(MGenericTile<T> object) { + return createGenericTileAdapter(); + } + + /** + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Override + @Deprecated + public Adapter caseInput(MInput object) { + return createInputAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseGenericStack(MGenericStack<T> object) { + return createGenericStackAdapter(); + } + + @Override + public Adapter caseSnippetContainer(MSnippetContainer object) { + return createSnippetContainerAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseGenericTrimContainer(MGenericTrimContainer<T> object) { + return createGenericTrimContainerAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @param target + * the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @Override public Adapter createAdapter(Notifier target) { - return modelSwitch.doSwitch((EObject)target); + return modelSwitch.doSwitch((EObject) target); } - /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MPart <em>Part</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MPart <em>Part</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MPart * @since 1.0 @@ -241,11 +295,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MCompositePart <em>Composite Part</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MCompositePart + * <em>Composite Part</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MCompositePart * @since 1.1 @@ -256,16 +312,20 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MInputPart <em>Input Part</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MInputPart <em>Input + * Part</em>}'. <!-- begin-user-doc --> This default implementation returns null + * so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MInputPart * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public Adapter createInputPartAdapter() { @@ -273,11 +333,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MPartStack <em>Part Stack</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MPartStack <em>Part + * Stack</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MPartStack * @since 1.0 @@ -288,11 +349,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer <em>Part Sash Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer + * <em>Part Sash Container</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer * @since 1.0 @@ -303,11 +366,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MWindow <em>Window</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MWindow + * <em>Window</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MWindow * @since 1.0 @@ -318,11 +382,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow <em>Trimmed Window</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow + * <em>Trimmed Window</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow * @since 1.0 @@ -333,11 +399,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimElement <em>Trim Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimElement <em>Trim + * Element</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MTrimElement * @since 1.0 @@ -348,11 +415,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement <em>Part Sash Container Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement + * <em>Part Sash Container Element</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement * @since 1.0 @@ -363,11 +432,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MWindowElement <em>Window Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MWindowElement + * <em>Window Element</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MWindowElement * @since 1.0 @@ -378,11 +449,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimBar <em>Trim Bar</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MTrimBar <em>Trim + * Bar</em>}'. <!-- begin-user-doc --> This default implementation returns null + * so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MTrimBar * @since 1.0 @@ -393,11 +465,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MStackElement <em>Stack Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MStackElement <em>Stack + * Element</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MStackElement * @since 1.0 @@ -408,11 +481,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MDialog <em>Dialog</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MDialog + * <em>Dialog</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MDialog * @since 1.1 @@ -423,11 +497,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog <em>Wizard Dialog</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog <em>Wizard + * Dialog</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog * @since 1.1 @@ -438,11 +513,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.MApplicationElement <em>Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.MApplicationElement + * <em>Element</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.MApplicationElement * @since 1.0 @@ -453,11 +529,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.MContribution <em>Contribution</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.MContribution + * <em>Contribution</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.MContribution * @since 1.0 @@ -468,11 +545,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MContext <em>Context</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MContext <em>Context</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MContext * @since 1.0 @@ -483,11 +561,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MUIElement <em>UI Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MUIElement <em>UI + * Element</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MUIElement * @since 1.0 @@ -498,11 +577,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MUILabel <em>UI Label</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MUILabel <em>UI Label</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MUILabel * @since 1.0 @@ -513,11 +593,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.commands.MHandlerContainer <em>Handler Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.commands.MHandlerContainer + * <em>Handler Container</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.commands.MHandlerContainer * @since 1.0 @@ -528,11 +610,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MDirtyable <em>Dirtyable</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MDirtyable + * <em>Dirtyable</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MDirtyable * @since 1.0 @@ -543,11 +626,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.commands.MBindings <em>Bindings</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.commands.MBindings + * <em>Bindings</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.commands.MBindings * @since 1.0 @@ -558,11 +642,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MLocalizable <em>Localizable</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MLocalizable + * <em>Localizable</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MLocalizable * @since 1.1 @@ -573,11 +658,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}'. <!-- + * begin-user-doc --> This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch + * all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MInput * @since 1.0 @@ -590,11 +676,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element + * Container</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MElementContainer * @since 1.0 @@ -605,11 +692,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericStack <em>Generic Stack</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MGenericStack <em>Generic + * Stack</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MGenericStack * @since 1.0 @@ -620,11 +708,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericTile <em>Generic Tile</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MGenericTile <em>Generic + * Tile</em>}'. <!-- begin-user-doc --> This default implementation returns null + * so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MGenericTile * @since 1.0 @@ -635,11 +724,12 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet + * Container</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MSnippetContainer * @since 1.0 @@ -650,11 +740,13 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer <em>Generic Trim Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer + * <em>Generic Trim Container</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer * @since 1.0 @@ -665,10 +757,9 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> + * Creates a new adapter for the default case. <!-- begin-user-doc --> This + * default implementation returns null. <!-- end-user-doc --> + * * @return the new adapter. * @generated */ @@ -676,4 +767,4 @@ public class BasicAdapterFactory extends AdapterFactoryImpl { return null; } -} //BasicAdapterFactory +} // BasicAdapterFactory diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java index b8ec78f5b37..8dd14f2fcb4 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java @@ -25,7 +25,20 @@ import org.eclipse.e4.ui.model.application.ui.MLocalizable; import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.e4.ui.model.application.ui.MUILabel; -import org.eclipse.e4.ui.model.application.ui.basic.*; +import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart; +import org.eclipse.e4.ui.model.application.ui.basic.MDialog; +import org.eclipse.e4.ui.model.application.ui.basic.MInputPart; +import org.eclipse.e4.ui.model.application.ui.basic.MPart; +import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer; +import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement; +import org.eclipse.e4.ui.model.application.ui.basic.MPartStack; +import org.eclipse.e4.ui.model.application.ui.basic.MStackElement; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement; +import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow; +import org.eclipse.e4.ui.model.application.ui.basic.MWindow; +import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement; +import org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog; import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -89,203 +102,183 @@ public class BasicSwitch<T1> extends Switch<T1> { @Override protected T1 doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { - case BasicPackageImpl.PART: { - MPart part = (MPart)theEObject; - T1 result = casePart(part); - if (result == null) result = casePartSashContainerElement(part); - if (result == null) result = caseStackElement(part); - if (result == null) result = caseContribution(part); - if (result == null) result = caseContext(part); - if (result == null) result = caseUILabel(part); - if (result == null) result = caseHandlerContainer(part); - if (result == null) result = caseDirtyable(part); - if (result == null) result = caseBindings(part); - if (result == null) result = caseWindowElement(part); - if (result == null) result = caseUIElement(part); - if (result == null) result = caseApplicationElement(part); - if (result == null) result = caseLocalizable(part); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.COMPOSITE_PART: { - MCompositePart compositePart = (MCompositePart)theEObject; - T1 result = caseCompositePart(compositePart); - if (result == null) result = casePart(compositePart); - if (result == null) result = caseGenericTile(compositePart); - if (result == null) result = casePartSashContainerElement(compositePart); - if (result == null) result = caseStackElement(compositePart); - if (result == null) result = caseContribution(compositePart); - if (result == null) result = caseContext(compositePart); - if (result == null) result = caseUILabel(compositePart); - if (result == null) result = caseHandlerContainer(compositePart); - if (result == null) result = caseDirtyable(compositePart); - if (result == null) result = caseBindings(compositePart); - if (result == null) result = caseWindowElement(compositePart); - if (result == null) result = caseElementContainer(compositePart); - if (result == null) result = caseUIElement(compositePart); - if (result == null) result = caseApplicationElement(compositePart); - if (result == null) result = caseLocalizable(compositePart); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.INPUT_PART: { - MInputPart inputPart = (MInputPart)theEObject; - T1 result = caseInputPart(inputPart); - if (result == null) result = casePart(inputPart); - if (result == null) result = caseInput(inputPart); - if (result == null) result = casePartSashContainerElement(inputPart); - if (result == null) result = caseStackElement(inputPart); - if (result == null) result = caseContribution(inputPart); - if (result == null) result = caseContext(inputPart); - if (result == null) result = caseUILabel(inputPart); - if (result == null) result = caseHandlerContainer(inputPart); - if (result == null) result = caseDirtyable(inputPart); - if (result == null) result = caseBindings(inputPart); - if (result == null) result = caseWindowElement(inputPart); - if (result == null) result = caseUIElement(inputPart); - if (result == null) result = caseApplicationElement(inputPart); - if (result == null) result = caseLocalizable(inputPart); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.PART_STACK: { - MPartStack partStack = (MPartStack)theEObject; - T1 result = casePartStack(partStack); - if (result == null) result = caseGenericStack(partStack); - if (result == null) result = casePartSashContainerElement(partStack); - if (result == null) result = caseWindowElement(partStack); - if (result == null) result = caseElementContainer(partStack); - if (result == null) result = caseUIElement(partStack); - if (result == null) result = caseApplicationElement(partStack); - if (result == null) result = caseLocalizable(partStack); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.PART_SASH_CONTAINER: { - MPartSashContainer partSashContainer = (MPartSashContainer)theEObject; - T1 result = casePartSashContainer(partSashContainer); - if (result == null) result = caseGenericTile(partSashContainer); - if (result == null) result = casePartSashContainerElement(partSashContainer); - if (result == null) result = caseWindowElement(partSashContainer); - if (result == null) result = caseElementContainer(partSashContainer); - if (result == null) result = caseUIElement(partSashContainer); - if (result == null) result = caseApplicationElement(partSashContainer); - if (result == null) result = caseLocalizable(partSashContainer); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.WINDOW: { - MWindow window = (MWindow)theEObject; - T1 result = caseWindow(window); - if (result == null) result = caseElementContainer(window); - if (result == null) result = caseUILabel(window); - if (result == null) result = caseContext(window); - if (result == null) result = caseHandlerContainer(window); - if (result == null) result = caseBindings(window); - if (result == null) result = caseSnippetContainer(window); - if (result == null) result = caseUIElement(window); - if (result == null) result = caseApplicationElement(window); - if (result == null) result = caseLocalizable(window); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.TRIMMED_WINDOW: { - MTrimmedWindow trimmedWindow = (MTrimmedWindow)theEObject; - T1 result = caseTrimmedWindow(trimmedWindow); - if (result == null) result = caseWindow(trimmedWindow); - if (result == null) result = caseElementContainer(trimmedWindow); - if (result == null) result = caseUILabel(trimmedWindow); - if (result == null) result = caseContext(trimmedWindow); - if (result == null) result = caseHandlerContainer(trimmedWindow); - if (result == null) result = caseBindings(trimmedWindow); - if (result == null) result = caseSnippetContainer(trimmedWindow); - if (result == null) result = caseUIElement(trimmedWindow); - if (result == null) result = caseApplicationElement(trimmedWindow); - if (result == null) result = caseLocalizable(trimmedWindow); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.TRIM_ELEMENT: { - MTrimElement trimElement = (MTrimElement)theEObject; - T1 result = caseTrimElement(trimElement); - if (result == null) result = caseUIElement(trimElement); - if (result == null) result = caseApplicationElement(trimElement); - if (result == null) result = caseLocalizable(trimElement); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.PART_SASH_CONTAINER_ELEMENT: { - MPartSashContainerElement partSashContainerElement = (MPartSashContainerElement)theEObject; - T1 result = casePartSashContainerElement(partSashContainerElement); - if (result == null) result = caseUIElement(partSashContainerElement); - if (result == null) result = caseApplicationElement(partSashContainerElement); - if (result == null) result = caseLocalizable(partSashContainerElement); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.WINDOW_ELEMENT: { - MWindowElement windowElement = (MWindowElement)theEObject; - T1 result = caseWindowElement(windowElement); - if (result == null) result = caseUIElement(windowElement); - if (result == null) result = caseApplicationElement(windowElement); - if (result == null) result = caseLocalizable(windowElement); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.TRIM_BAR: { - MTrimBar trimBar = (MTrimBar)theEObject; - T1 result = caseTrimBar(trimBar); - if (result == null) result = caseGenericTrimContainer(trimBar); - if (result == null) result = caseElementContainer(trimBar); - if (result == null) result = caseUIElement(trimBar); - if (result == null) result = caseApplicationElement(trimBar); - if (result == null) result = caseLocalizable(trimBar); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.STACK_ELEMENT: { - MStackElement stackElement = (MStackElement)theEObject; - T1 result = caseStackElement(stackElement); - if (result == null) result = caseUIElement(stackElement); - if (result == null) result = caseApplicationElement(stackElement); - if (result == null) result = caseLocalizable(stackElement); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.DIALOG: { - MDialog dialog = (MDialog)theEObject; - T1 result = caseDialog(dialog); - if (result == null) result = caseWindow(dialog); - if (result == null) result = caseElementContainer(dialog); - if (result == null) result = caseUILabel(dialog); - if (result == null) result = caseContext(dialog); - if (result == null) result = caseHandlerContainer(dialog); - if (result == null) result = caseBindings(dialog); - if (result == null) result = caseSnippetContainer(dialog); - if (result == null) result = caseUIElement(dialog); - if (result == null) result = caseApplicationElement(dialog); - if (result == null) result = caseLocalizable(dialog); - if (result == null) result = defaultCase(theEObject); - return result; - } - case BasicPackageImpl.WIZARD_DIALOG: { - MWizardDialog wizardDialog = (MWizardDialog)theEObject; - T1 result = caseWizardDialog(wizardDialog); - if (result == null) result = caseDialog(wizardDialog); - if (result == null) result = caseWindow(wizardDialog); - if (result == null) result = caseElementContainer(wizardDialog); - if (result == null) result = caseUILabel(wizardDialog); - if (result == null) result = caseContext(wizardDialog); - if (result == null) result = caseHandlerContainer(wizardDialog); - if (result == null) result = caseBindings(wizardDialog); - if (result == null) result = caseSnippetContainer(wizardDialog); - if (result == null) result = caseUIElement(wizardDialog); - if (result == null) result = caseApplicationElement(wizardDialog); - if (result == null) result = caseLocalizable(wizardDialog); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); + case BasicPackageImpl.PART: { + MPart part = (MPart)theEObject; + T1 result = casePart(part); + if (result == null) result = casePartSashContainerElement(part); + if (result == null) result = caseStackElement(part); + if (result == null) result = caseContribution(part); + if (result == null) result = caseContext(part); + if (result == null) result = caseUILabel(part); + if (result == null) result = caseHandlerContainer(part); + if (result == null) result = caseDirtyable(part); + if (result == null) result = caseBindings(part); + if (result == null) result = caseWindowElement(part); + if (result == null) result = caseUIElement(part); + if (result == null) result = caseApplicationElement(part); + if (result == null) result = caseLocalizable(part); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.COMPOSITE_PART: { + MCompositePart compositePart = (MCompositePart)theEObject; + T1 result = caseCompositePart(compositePart); + if (result == null) result = casePart(compositePart); + if (result == null) result = caseGenericTile(compositePart); + if (result == null) result = casePartSashContainerElement(compositePart); + if (result == null) result = caseStackElement(compositePart); + if (result == null) result = caseContribution(compositePart); + if (result == null) result = caseContext(compositePart); + if (result == null) result = caseUILabel(compositePart); + if (result == null) result = caseHandlerContainer(compositePart); + if (result == null) result = caseDirtyable(compositePart); + if (result == null) result = caseBindings(compositePart); + if (result == null) result = caseWindowElement(compositePart); + if (result == null) result = caseElementContainer(compositePart); + if (result == null) result = caseUIElement(compositePart); + if (result == null) result = caseApplicationElement(compositePart); + if (result == null) result = caseLocalizable(compositePart); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.PART_STACK: { + MPartStack partStack = (MPartStack)theEObject; + T1 result = casePartStack(partStack); + if (result == null) result = caseGenericStack(partStack); + if (result == null) result = casePartSashContainerElement(partStack); + if (result == null) result = caseWindowElement(partStack); + if (result == null) result = caseElementContainer(partStack); + if (result == null) result = caseUIElement(partStack); + if (result == null) result = caseApplicationElement(partStack); + if (result == null) result = caseLocalizable(partStack); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.PART_SASH_CONTAINER: { + MPartSashContainer partSashContainer = (MPartSashContainer)theEObject; + T1 result = casePartSashContainer(partSashContainer); + if (result == null) result = caseGenericTile(partSashContainer); + if (result == null) result = casePartSashContainerElement(partSashContainer); + if (result == null) result = caseWindowElement(partSashContainer); + if (result == null) result = caseElementContainer(partSashContainer); + if (result == null) result = caseUIElement(partSashContainer); + if (result == null) result = caseApplicationElement(partSashContainer); + if (result == null) result = caseLocalizable(partSashContainer); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.WINDOW: { + MWindow window = (MWindow)theEObject; + T1 result = caseWindow(window); + if (result == null) result = caseElementContainer(window); + if (result == null) result = caseUILabel(window); + if (result == null) result = caseContext(window); + if (result == null) result = caseHandlerContainer(window); + if (result == null) result = caseBindings(window); + if (result == null) result = caseSnippetContainer(window); + if (result == null) result = caseUIElement(window); + if (result == null) result = caseApplicationElement(window); + if (result == null) result = caseLocalizable(window); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.TRIMMED_WINDOW: { + MTrimmedWindow trimmedWindow = (MTrimmedWindow)theEObject; + T1 result = caseTrimmedWindow(trimmedWindow); + if (result == null) result = caseWindow(trimmedWindow); + if (result == null) result = caseElementContainer(trimmedWindow); + if (result == null) result = caseUILabel(trimmedWindow); + if (result == null) result = caseContext(trimmedWindow); + if (result == null) result = caseHandlerContainer(trimmedWindow); + if (result == null) result = caseBindings(trimmedWindow); + if (result == null) result = caseSnippetContainer(trimmedWindow); + if (result == null) result = caseUIElement(trimmedWindow); + if (result == null) result = caseApplicationElement(trimmedWindow); + if (result == null) result = caseLocalizable(trimmedWindow); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.TRIM_ELEMENT: { + MTrimElement trimElement = (MTrimElement)theEObject; + T1 result = caseTrimElement(trimElement); + if (result == null) result = caseUIElement(trimElement); + if (result == null) result = caseApplicationElement(trimElement); + if (result == null) result = caseLocalizable(trimElement); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.PART_SASH_CONTAINER_ELEMENT: { + MPartSashContainerElement partSashContainerElement = (MPartSashContainerElement)theEObject; + T1 result = casePartSashContainerElement(partSashContainerElement); + if (result == null) result = caseUIElement(partSashContainerElement); + if (result == null) result = caseApplicationElement(partSashContainerElement); + if (result == null) result = caseLocalizable(partSashContainerElement); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.WINDOW_ELEMENT: { + MWindowElement windowElement = (MWindowElement)theEObject; + T1 result = caseWindowElement(windowElement); + if (result == null) result = caseUIElement(windowElement); + if (result == null) result = caseApplicationElement(windowElement); + if (result == null) result = caseLocalizable(windowElement); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.TRIM_BAR: { + MTrimBar trimBar = (MTrimBar)theEObject; + T1 result = caseTrimBar(trimBar); + if (result == null) result = caseGenericTrimContainer(trimBar); + if (result == null) result = caseElementContainer(trimBar); + if (result == null) result = caseUIElement(trimBar); + if (result == null) result = caseApplicationElement(trimBar); + if (result == null) result = caseLocalizable(trimBar); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.STACK_ELEMENT: { + MStackElement stackElement = (MStackElement)theEObject; + T1 result = caseStackElement(stackElement); + if (result == null) result = caseUIElement(stackElement); + if (result == null) result = caseApplicationElement(stackElement); + if (result == null) result = caseLocalizable(stackElement); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.DIALOG: { + MDialog dialog = (MDialog)theEObject; + T1 result = caseDialog(dialog); + if (result == null) result = caseWindow(dialog); + if (result == null) result = caseElementContainer(dialog); + if (result == null) result = caseUILabel(dialog); + if (result == null) result = caseContext(dialog); + if (result == null) result = caseHandlerContainer(dialog); + if (result == null) result = caseBindings(dialog); + if (result == null) result = caseSnippetContainer(dialog); + if (result == null) result = caseUIElement(dialog); + if (result == null) result = caseApplicationElement(dialog); + if (result == null) result = caseLocalizable(dialog); + if (result == null) result = defaultCase(theEObject); + return result; + } + case BasicPackageImpl.WIZARD_DIALOG: { + MWizardDialog wizardDialog = (MWizardDialog)theEObject; + T1 result = caseWizardDialog(wizardDialog); + if (result == null) result = caseDialog(wizardDialog); + if (result == null) result = caseWindow(wizardDialog); + if (result == null) result = caseElementContainer(wizardDialog); + if (result == null) result = caseUILabel(wizardDialog); + if (result == null) result = caseContext(wizardDialog); + if (result == null) result = caseHandlerContainer(wizardDialog); + if (result == null) result = caseBindings(wizardDialog); + if (result == null) result = caseSnippetContainer(wizardDialog); + if (result == null) result = caseUIElement(wizardDialog); + if (result == null) result = caseApplicationElement(wizardDialog); + if (result == null) result = caseLocalizable(wizardDialog); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); } } @@ -322,17 +315,22 @@ public class BasicSwitch<T1> extends Switch<T1> { } /** - * Returns the result of interpreting the object as an instance of '<em>Input Part</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Input Part</em>'. + * Returns the result of interpreting the object as an instance of '<em>Input + * Part</em>'. <!-- begin-user-doc --> This implementation returns null; + * returning a non-null result will terminate the switch. <!-- end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Input + * Part</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @since 1.0 * @deprecated See {@link MInputPart model documentation} for details. - * @generated + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + * */ @Deprecated public T1 caseInputPart(MInputPart object) { @@ -660,17 +658,21 @@ public class BasicSwitch<T1> extends Switch<T1> { } /** - * Returns the result of interpreting the object as an instance of '<em>Input</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Input</em>'. + * Returns the result of interpreting the object as an instance of + * '<em>Input</em>'. <!-- begin-user-doc --> This implementation returns null; + * returning a non-null result will terminate the switch. <!-- end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of + * '<em>Input</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public T1 caseInput(MInput object) { diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java index b63e3226196..59ca0355b14 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiFactoryImpl.java @@ -10,7 +10,10 @@ */ package org.eclipse.e4.ui.model.application.ui.impl; -import org.eclipse.e4.ui.model.application.ui.*; +import org.eclipse.e4.ui.model.application.ui.MCoreExpression; +import org.eclipse.e4.ui.model.application.ui.MImperativeExpression; +import org.eclipse.e4.ui.model.application.ui.MUiFactory; +import org.eclipse.e4.ui.model.application.ui.SideValue; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; @@ -24,7 +27,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; * <!-- end-user-doc --> * @generated */ -@SuppressWarnings("deprecation") public class UiFactoryImpl extends EFactoryImpl implements MUiFactory { /** * The singleton instance of the factory. diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java index 6c20bce592c..39c20765cd4 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java @@ -57,7 +57,6 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; * @model kind="package" * @generated */ -@SuppressWarnings("deprecation") public class UiPackageImpl extends EPackageImpl { /** * The package name. @@ -194,50 +193,63 @@ public class UiPackageImpl extends EPackageImpl { public static final int DIRTYABLE_OPERATION_COUNT = 0; /** - * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The meta object id for the + * '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.e4.ui.model.application.ui.MInput * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getInput() * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT = 2; /** - * The feature id for the '<em><b>Input URI</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The feature id for the '<em><b>Input URI</b></em>' attribute. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT__INPUT_URI = 0; /** - * The number of structural features of the '<em>Input</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The number of structural features of the '<em>Input</em>' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT_FEATURE_COUNT = 1; /** - * The number of operations of the '<em>Input</em>' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The number of operations of the '<em>Input</em>' class. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT * @ordered + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final int INPUT_OPERATION_COUNT = 0; @@ -1837,11 +1849,13 @@ public class UiPackageImpl extends EPackageImpl { private EClass dirtyableEClass = null; /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT +- * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated private EClass inputEClass = null; @@ -2112,14 +2126,18 @@ public class UiPackageImpl extends EPackageImpl { } /** - * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Returns the meta object for class + * '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for class '<em>Input</em>'. * @see org.eclipse.e4.ui.model.application.ui.MInput * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public EClass getInput() { @@ -2127,15 +2145,19 @@ public class UiPackageImpl extends EPackageImpl { } /** - * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MInput#getInputURI <em>Input URI</em>}'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Returns the meta object for the attribute + * '{@link org.eclipse.e4.ui.model.application.ui.MInput#getInputURI <em>Input + * URI</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @return the meta object for the attribute '<em>Input URI</em>'. * @see org.eclipse.e4.ui.model.application.ui.MInput#getInputURI() * @see #getInput() * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference this method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public EAttribute getInput_InputURI() { @@ -2970,25 +2992,32 @@ public class UiPackageImpl extends EPackageImpl { public static final EAttribute DIRTYABLE__DIRTY = eINSTANCE.getDirtyable_Dirty(); /** - * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}' class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The meta object literal for the + * '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @see org.eclipse.e4.ui.model.application.ui.MInput * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl#getInput() * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final EClass INPUT = eINSTANCE.getInput(); /** - * The meta object literal for the '<em><b>Input URI</b></em>' attribute feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The meta object literal for the '<em><b>Input URI</b></em>' attribute + * feature. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public static final EAttribute INPUT__INPUT_URI = eINSTANCE.getInput_InputURI(); diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java index 4895c539797..5714f1c90bc 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiAdapterFactory.java @@ -12,7 +12,20 @@ package org.eclipse.e4.ui.model.application.ui.util; import org.eclipse.e4.ui.model.application.MApplicationElement; import org.eclipse.e4.ui.model.application.MContribution; -import org.eclipse.e4.ui.model.application.ui.*; +import org.eclipse.e4.ui.model.application.ui.MContext; +import org.eclipse.e4.ui.model.application.ui.MCoreExpression; +import org.eclipse.e4.ui.model.application.ui.MDirtyable; +import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MExpression; +import org.eclipse.e4.ui.model.application.ui.MGenericStack; +import org.eclipse.e4.ui.model.application.ui.MGenericTile; +import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer; +import org.eclipse.e4.ui.model.application.ui.MImperativeExpression; +import org.eclipse.e4.ui.model.application.ui.MInput; +import org.eclipse.e4.ui.model.application.ui.MLocalizable; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; +import org.eclipse.e4.ui.model.application.ui.MUIElement; +import org.eclipse.e4.ui.model.application.ui.MUILabel; import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -20,27 +33,26 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; /** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> + * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides + * an adapter <code>createXXX</code> method for each class of the model. <!-- + * end-user-doc --> + * * @see org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl * @generated */ @SuppressWarnings("deprecation") public class UiAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected static UiPackageImpl modelPackage; /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @generated */ public UiAdapterFactory() { @@ -50,10 +62,11 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. + * Returns whether this factory is applicable for the type of the object. <!-- + * begin-user-doc --> This implementation returns <code>true</code> if the + * object is either the model's package or is an instance object of the model. * <!-- end-user-doc --> + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -63,109 +76,130 @@ public class UiAdapterFactory extends AdapterFactoryImpl { return true; } if (object instanceof EObject) { - return ((EObject)object).eClass().getEPackage() == modelPackage; + return ((EObject) object).eClass().getEPackage() == modelPackage; } return false; } /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * The switch that delegates to the <code>createXXX</code> methods. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @generated */ - protected UiSwitch<Adapter> modelSwitch = - new UiSwitch<Adapter>() { - @Override - public Adapter caseContext(MContext object) { - return createContextAdapter(); - } - @Override - public Adapter caseDirtyable(MDirtyable object) { - return createDirtyableAdapter(); - } - @Override - public Adapter caseInput(MInput object) { - return createInputAdapter(); - } - @Override - public Adapter caseUIElement(MUIElement object) { - return createUIElementAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseElementContainer(MElementContainer<T> object) { - return createElementContainerAdapter(); - } - @Override - public Adapter caseUILabel(MUILabel object) { - return createUILabelAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseGenericStack(MGenericStack<T> object) { - return createGenericStackAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseGenericTile(MGenericTile<T> object) { - return createGenericTileAdapter(); - } - @Override - public <T extends MUIElement> Adapter caseGenericTrimContainer(MGenericTrimContainer<T> object) { - return createGenericTrimContainerAdapter(); - } - @Override - public Adapter caseExpression(MExpression object) { - return createExpressionAdapter(); - } - @Override - public Adapter caseCoreExpression(MCoreExpression object) { - return createCoreExpressionAdapter(); - } - @Override - public Adapter caseImperativeExpression(MImperativeExpression object) { - return createImperativeExpressionAdapter(); - } - @Override - public Adapter caseSnippetContainer(MSnippetContainer object) { - return createSnippetContainerAdapter(); - } - @Override - public Adapter caseLocalizable(MLocalizable object) { - return createLocalizableAdapter(); - } - @Override - public Adapter caseApplicationElement(MApplicationElement object) { - return createApplicationElementAdapter(); - } - @Override - public Adapter caseContribution(MContribution object) { - return createContributionAdapter(); - } - @Override - public Adapter defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; + protected UiSwitch<Adapter> modelSwitch = new UiSwitch<Adapter>() { + @Override + public Adapter caseContext(MContext object) { + return createContextAdapter(); + } + + @Override + public Adapter caseDirtyable(MDirtyable object) { + return createDirtyableAdapter(); + } + + /** + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Deprecated + public Adapter caseInput(MInput object) { + return createInputAdapter(); + } + + @Override + public Adapter caseUIElement(MUIElement object) { + return createUIElementAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseElementContainer(MElementContainer<T> object) { + return createElementContainerAdapter(); + } + + @Override + public Adapter caseUILabel(MUILabel object) { + return createUILabelAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseGenericStack(MGenericStack<T> object) { + return createGenericStackAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseGenericTile(MGenericTile<T> object) { + return createGenericTileAdapter(); + } + + @Override + public <T extends MUIElement> Adapter caseGenericTrimContainer(MGenericTrimContainer<T> object) { + return createGenericTrimContainerAdapter(); + } + + @Override + public Adapter caseExpression(MExpression object) { + return createExpressionAdapter(); + } + + @Override + public Adapter caseCoreExpression(MCoreExpression object) { + return createCoreExpressionAdapter(); + } + + @Override + public Adapter caseImperativeExpression(MImperativeExpression object) { + return createImperativeExpressionAdapter(); + } + + @Override + public Adapter caseSnippetContainer(MSnippetContainer object) { + return createSnippetContainerAdapter(); + } + + @Override + public Adapter caseLocalizable(MLocalizable object) { + return createLocalizableAdapter(); + } + + @Override + public Adapter caseApplicationElement(MApplicationElement object) { + return createApplicationElementAdapter(); + } + + @Override + public Adapter caseContribution(MContribution object) { + return createContributionAdapter(); + } + + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @param target + * the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @Override public Adapter createAdapter(Notifier target) { - return modelSwitch.doSwitch((EObject)target); + return modelSwitch.doSwitch((EObject) target); } - /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MContext <em>Context</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MContext <em>Context</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MContext * @since 1.0 @@ -176,11 +210,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MDirtyable <em>Dirtyable</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MDirtyable + * <em>Dirtyable</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MDirtyable * @since 1.0 @@ -191,16 +226,20 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MInput <em>Input</em>}'. <!-- + * begin-user-doc --> This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch + * all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MInput * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ @Deprecated public Adapter createInputAdapter() { @@ -208,11 +247,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MUIElement <em>UI Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MUIElement <em>UI + * Element</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MUIElement * @since 1.0 @@ -223,11 +263,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MUILabel <em>UI Label</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MUILabel <em>UI Label</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we + * can easily ignore cases; it's useful to ignore a case when inheritance will + * catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MUILabel * @since 1.0 @@ -238,11 +279,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element + * Container</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MElementContainer * @since 1.0 @@ -253,11 +295,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericStack <em>Generic Stack</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MGenericStack <em>Generic + * Stack</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MGenericStack * @since 1.0 @@ -268,11 +311,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericTile <em>Generic Tile</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MGenericTile <em>Generic + * Tile</em>}'. <!-- begin-user-doc --> This default implementation returns null + * so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MGenericTile * @since 1.0 @@ -283,11 +327,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer <em>Generic Trim Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer + * <em>Generic Trim Container</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer * @since 1.0 @@ -298,11 +344,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MExpression <em>Expression</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MExpression + * <em>Expression</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MExpression * @since 1.0 @@ -313,11 +360,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MCoreExpression <em>Core Expression</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MCoreExpression <em>Core + * Expression</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MCoreExpression * @since 1.0 @@ -328,11 +376,13 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MImperativeExpression <em>Imperative Expression</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MImperativeExpression + * <em>Imperative Expression</em>}'. <!-- begin-user-doc --> This default + * implementation returns null so that we can easily ignore cases; it's useful + * to ignore a case when inheritance will catch all the cases anyway. <!-- + * end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MImperativeExpression * @generated @@ -342,11 +392,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet Container</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MSnippetContainer <em>Snippet + * Container</em>}'. <!-- begin-user-doc --> This default implementation returns + * null so that we can easily ignore cases; it's useful to ignore a case when + * inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MSnippetContainer * @since 1.0 @@ -357,11 +408,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.ui.MLocalizable <em>Localizable</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.ui.MLocalizable + * <em>Localizable</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.ui.MLocalizable * @since 1.1 @@ -372,11 +424,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.MApplicationElement <em>Element</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.MApplicationElement + * <em>Element</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.MApplicationElement * @since 1.0 @@ -387,11 +440,12 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.e4.ui.model.application.MContribution <em>Contribution</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> + * Creates a new adapter for an object of class + * '{@link org.eclipse.e4.ui.model.application.MContribution + * <em>Contribution</em>}'. <!-- begin-user-doc --> This default implementation + * returns null so that we can easily ignore cases; it's useful to ignore a case + * when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.e4.ui.model.application.MContribution * @since 1.0 @@ -402,10 +456,9 @@ public class UiAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> + * Creates a new adapter for the default case. <!-- begin-user-doc --> This + * default implementation returns null. <!-- end-user-doc --> + * * @return the new adapter. * @generated */ @@ -413,4 +466,4 @@ public class UiAdapterFactory extends AdapterFactoryImpl { return null; } -} //UiAdapterFactory +} // UiAdapterFactory diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java index 57c35e5e378..2e1535f08fe 100644 --- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java +++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/util/UiSwitch.java @@ -12,7 +12,20 @@ package org.eclipse.e4.ui.model.application.ui.util; import org.eclipse.e4.ui.model.application.MApplicationElement; import org.eclipse.e4.ui.model.application.MContribution; -import org.eclipse.e4.ui.model.application.ui.*; +import org.eclipse.e4.ui.model.application.ui.MContext; +import org.eclipse.e4.ui.model.application.ui.MCoreExpression; +import org.eclipse.e4.ui.model.application.ui.MDirtyable; +import org.eclipse.e4.ui.model.application.ui.MElementContainer; +import org.eclipse.e4.ui.model.application.ui.MExpression; +import org.eclipse.e4.ui.model.application.ui.MGenericStack; +import org.eclipse.e4.ui.model.application.ui.MGenericTile; +import org.eclipse.e4.ui.model.application.ui.MGenericTrimContainer; +import org.eclipse.e4.ui.model.application.ui.MImperativeExpression; +import org.eclipse.e4.ui.model.application.ui.MInput; +import org.eclipse.e4.ui.model.application.ui.MLocalizable; +import org.eclipse.e4.ui.model.application.ui.MSnippetContainer; +import org.eclipse.e4.ui.model.application.ui.MUIElement; +import org.eclipse.e4.ui.model.application.ui.MUILabel; import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -76,115 +89,109 @@ public class UiSwitch<T1> extends Switch<T1> { @Override protected T1 doSwitch(int classifierID, EObject theEObject) { switch (classifierID) { - case UiPackageImpl.CONTEXT: { - MContext context = (MContext)theEObject; - T1 result = caseContext(context); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.DIRTYABLE: { - MDirtyable dirtyable = (MDirtyable)theEObject; - T1 result = caseDirtyable(dirtyable); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.INPUT: { - MInput input = (MInput)theEObject; - T1 result = caseInput(input); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.UI_ELEMENT: { - MUIElement uiElement = (MUIElement)theEObject; - T1 result = caseUIElement(uiElement); - if (result == null) result = caseApplicationElement(uiElement); - if (result == null) result = caseLocalizable(uiElement); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.ELEMENT_CONTAINER: { - MElementContainer<?> elementContainer = (MElementContainer<?>)theEObject; - T1 result = caseElementContainer(elementContainer); - if (result == null) result = caseUIElement(elementContainer); - if (result == null) result = caseApplicationElement(elementContainer); - if (result == null) result = caseLocalizable(elementContainer); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.UI_LABEL: { - MUILabel uiLabel = (MUILabel)theEObject; - T1 result = caseUILabel(uiLabel); - if (result == null) result = caseLocalizable(uiLabel); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.GENERIC_STACK: { - MGenericStack<?> genericStack = (MGenericStack<?>)theEObject; - T1 result = caseGenericStack(genericStack); - if (result == null) result = caseElementContainer(genericStack); - if (result == null) result = caseUIElement(genericStack); - if (result == null) result = caseApplicationElement(genericStack); - if (result == null) result = caseLocalizable(genericStack); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.GENERIC_TILE: { - MGenericTile<?> genericTile = (MGenericTile<?>)theEObject; - T1 result = caseGenericTile(genericTile); - if (result == null) result = caseElementContainer(genericTile); - if (result == null) result = caseUIElement(genericTile); - if (result == null) result = caseApplicationElement(genericTile); - if (result == null) result = caseLocalizable(genericTile); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.GENERIC_TRIM_CONTAINER: { - MGenericTrimContainer<?> genericTrimContainer = (MGenericTrimContainer<?>)theEObject; - T1 result = caseGenericTrimContainer(genericTrimContainer); - if (result == null) result = caseElementContainer(genericTrimContainer); - if (result == null) result = caseUIElement(genericTrimContainer); - if (result == null) result = caseApplicationElement(genericTrimContainer); - if (result == null) result = caseLocalizable(genericTrimContainer); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.EXPRESSION: { - MExpression expression = (MExpression)theEObject; - T1 result = caseExpression(expression); - if (result == null) result = caseApplicationElement(expression); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.CORE_EXPRESSION: { - MCoreExpression coreExpression = (MCoreExpression)theEObject; - T1 result = caseCoreExpression(coreExpression); - if (result == null) result = caseExpression(coreExpression); - if (result == null) result = caseApplicationElement(coreExpression); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.IMPERATIVE_EXPRESSION: { - MImperativeExpression imperativeExpression = (MImperativeExpression)theEObject; - T1 result = caseImperativeExpression(imperativeExpression); - if (result == null) result = caseExpression(imperativeExpression); - if (result == null) result = caseContribution(imperativeExpression); - if (result == null) result = caseApplicationElement(imperativeExpression); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.SNIPPET_CONTAINER: { - MSnippetContainer snippetContainer = (MSnippetContainer)theEObject; - T1 result = caseSnippetContainer(snippetContainer); - if (result == null) result = defaultCase(theEObject); - return result; - } - case UiPackageImpl.LOCALIZABLE: { - MLocalizable localizable = (MLocalizable)theEObject; - T1 result = caseLocalizable(localizable); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); + case UiPackageImpl.CONTEXT: { + MContext context = (MContext)theEObject; + T1 result = caseContext(context); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.DIRTYABLE: { + MDirtyable dirtyable = (MDirtyable)theEObject; + T1 result = caseDirtyable(dirtyable); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.UI_ELEMENT: { + MUIElement uiElement = (MUIElement)theEObject; + T1 result = caseUIElement(uiElement); + if (result == null) result = caseApplicationElement(uiElement); + if (result == null) result = caseLocalizable(uiElement); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.ELEMENT_CONTAINER: { + MElementContainer<?> elementContainer = (MElementContainer<?>)theEObject; + T1 result = caseElementContainer(elementContainer); + if (result == null) result = caseUIElement(elementContainer); + if (result == null) result = caseApplicationElement(elementContainer); + if (result == null) result = caseLocalizable(elementContainer); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.UI_LABEL: { + MUILabel uiLabel = (MUILabel)theEObject; + T1 result = caseUILabel(uiLabel); + if (result == null) result = caseLocalizable(uiLabel); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.GENERIC_STACK: { + MGenericStack<?> genericStack = (MGenericStack<?>)theEObject; + T1 result = caseGenericStack(genericStack); + if (result == null) result = caseElementContainer(genericStack); + if (result == null) result = caseUIElement(genericStack); + if (result == null) result = caseApplicationElement(genericStack); + if (result == null) result = caseLocalizable(genericStack); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.GENERIC_TILE: { + MGenericTile<?> genericTile = (MGenericTile<?>)theEObject; + T1 result = caseGenericTile(genericTile); + if (result == null) result = caseElementContainer(genericTile); + if (result == null) result = caseUIElement(genericTile); + if (result == null) result = caseApplicationElement(genericTile); + if (result == null) result = caseLocalizable(genericTile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.GENERIC_TRIM_CONTAINER: { + MGenericTrimContainer<?> genericTrimContainer = (MGenericTrimContainer<?>)theEObject; + T1 result = caseGenericTrimContainer(genericTrimContainer); + if (result == null) result = caseElementContainer(genericTrimContainer); + if (result == null) result = caseUIElement(genericTrimContainer); + if (result == null) result = caseApplicationElement(genericTrimContainer); + if (result == null) result = caseLocalizable(genericTrimContainer); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.EXPRESSION: { + MExpression expression = (MExpression)theEObject; + T1 result = caseExpression(expression); + if (result == null) result = caseApplicationElement(expression); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.CORE_EXPRESSION: { + MCoreExpression coreExpression = (MCoreExpression)theEObject; + T1 result = caseCoreExpression(coreExpression); + if (result == null) result = caseExpression(coreExpression); + if (result == null) result = caseApplicationElement(coreExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.IMPERATIVE_EXPRESSION: { + MImperativeExpression imperativeExpression = (MImperativeExpression)theEObject; + T1 result = caseImperativeExpression(imperativeExpression); + if (result == null) result = caseExpression(imperativeExpression); + if (result == null) result = caseContribution(imperativeExpression); + if (result == null) result = caseApplicationElement(imperativeExpression); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.SNIPPET_CONTAINER: { + MSnippetContainer snippetContainer = (MSnippetContainer)theEObject; + T1 result = caseSnippetContainer(snippetContainer); + if (result == null) result = defaultCase(theEObject); + return result; + } + case UiPackageImpl.LOCALIZABLE: { + MLocalizable localizable = (MLocalizable)theEObject; + T1 result = caseLocalizable(localizable); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); } } @@ -221,17 +228,22 @@ public class UiSwitch<T1> extends Switch<T1> { } /** - * Returns the result of interpreting the object as an instance of '<em>Input</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Input</em>'. + * Returns the result of interpreting the object as an instance of + * '<em>Input</em>'. <!-- begin-user-doc --> This implementation returns null; + * returning a non-null result will terminate the switch. <!-- end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of + * '<em>Input</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @since 1.0 * @deprecated See {@link MInput model documentation} for details. - * @generated + * @generated NOT + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + * */ @Deprecated public T1 caseInput(MInput object) { diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ApplicationPartServiceImpl.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ApplicationPartServiceImpl.java index 8dd5d891d13..a4775686419 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ApplicationPartServiceImpl.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ApplicationPartServiceImpl.java @@ -165,6 +165,12 @@ public class ApplicationPartServiceImpl implements EPartService { return getActiveWindowService().saveAll(confirm); } + /** + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Deprecated @Override public Collection<MInputPart> getInputParts(String inputUri) { return getActiveWindowService().getInputParts(inputUri); 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 548c27c577c..7d48cecc48a 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 @@ -1432,7 +1432,13 @@ public class PartServiceImpl implements EPartService { return true; } - @Override + @SuppressWarnings("deprecation") + /** + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Deprecated public Collection<MInputPart> getInputParts(String inputUri) { Assert.isNotNull(inputUri, "Input uri must not be null"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java index c0f50424735..5ac6d40a112 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/UIEvents.java @@ -1048,17 +1048,53 @@ public class UIEvents { String TRACKING = "tracking"; //$NON-NLS-1$ } + /** + * @noimplement This interface is not intended to be implemented by clients. + * @noextend This interface is not intended to be extended by clients. + * @noreference This interface is not intended to be referenced by clients + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ @SuppressWarnings("javadoc") + @Deprecated public interface Input { // Topics that can be subscribed to + /** + * @deprecated + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ @Deprecated String TOPIC = "org/eclipse/e4/ui/model/ui/Input"; //$NON-NLS-1$ + /** + * @deprecated + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Deprecated String TOPIC_ALL = "org/eclipse/e4/ui/model/ui/Input/*"; //$NON-NLS-1$ + + /** + * @deprecated + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Deprecated String TOPIC_INPUTURI = "org/eclipse/e4/ui/model/ui/Input/inputURI/*"; //$NON-NLS-1$ + /** + * @deprecated + * @noreference This field is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> + */ + @Deprecated // Attributes that can be tested in event handlers String INPUTURI = "inputURI"; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java index 8044cbe8bd1..c27cf9a0360 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java @@ -326,15 +326,20 @@ public interface EPartService { public boolean saveAll(boolean confirm); /** - * Returns a collection of all {@link MInputPart} with the inputURI-Attribute set to the given - * value + * Returns a collection of all {@link MInputPart} with the inputURI-Attribute + * set to the given value * * @param inputUri * the input uri to search for, must not be <code>null</code> * @return list of parts or an empty collection * @throws AssertionFailedException * if null passed as argument + * @deprecated This method should never be used as MInputPart are deprecated + * @noreference This method is not intended to be referenced by clients. + * @see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=509868">Bug + * 509868</a> */ + @Deprecated public Collection<MInputPart> getInputParts(String inputUri); /** diff --git a/tests/org.eclipse.e4.ui.tests/model/TestModel.ecore b/tests/org.eclipse.e4.ui.tests/model/TestModel.ecore index be3afde4ada..c5bab7b8ca6 100644 --- a/tests/org.eclipse.e4.ui.tests/model/TestModel.ecore +++ b/tests/org.eclipse.e4.ui.tests/model/TestModel.ecore @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<ecore:EPackage xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="test" - nsURI="http://www.eclipse.org/ui/2010/Test/UIModel/test" nsPrefix="test"> +<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="test" nsURI="http://www.eclipse.org/ui/2010/Test/UIModel/test" + nsPrefix="test"> <eClassifiers xsi:type="ecore:EClass" name="TestHarness"> <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ApplicationElement"/> <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//commands/Command"/> @@ -12,7 +11,6 @@ <eTypeArguments eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/UIElement"/> </eGenericSuperTypes> <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//commands/Parameter"/> - <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/Input"/> <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/UILabel"/> <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/Dirtyable"/> <eGenericSuperTypes eClassifier="ecore:EClass ../../org.eclipse.e4.ui.model.workbench/model/UIElements.ecore#//ui/SnippetContainer"/> diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java index c916d5ef93a..010cc460975 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/EPartServiceTest.java @@ -23,7 +23,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.eclipse.core.runtime.AssertionFailedException; import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.internal.workbench.PartServiceImpl; @@ -35,7 +34,6 @@ import org.eclipse.e4.ui.model.application.ui.advanced.MArea; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective; import org.eclipse.e4.ui.model.application.ui.advanced.MPerspectiveStack; import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder; -import org.eclipse.e4.ui.model.application.ui.basic.MInputPart; import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainer; import org.eclipse.e4.ui.model.application.ui.basic.MPartStack; @@ -674,133 +672,6 @@ public class EPartServiceTest extends UITest { assertTrue(parts.contains(partC)); } - @Test - public void testGetInputParts_Bug334559_01() { - MWindow window = ems.createModelElement(MWindow.class); - application.getChildren().add(window); - application.setSelectedElement(window); - - MPerspectiveStack perspectiveStack = ems.createModelElement(MPerspectiveStack.class); - window.getChildren().add(perspectiveStack); - window.setSelectedElement(perspectiveStack); - - MPerspective perspective = ems.createModelElement(MPerspective.class); - perspectiveStack.getChildren().add(perspective); - perspectiveStack.setSelectedElement(perspective); - - MInputPart partA = ems.createModelElement(MInputPart.class); - partA.setInputURI("http://www.eclipse.org"); - window.getChildren().add(partA); - window.setSelectedElement(partA); - - MWindow detachedWindow = ems.createModelElement(MWindow.class); - perspective.getWindows().add(detachedWindow); - - MInputPart partB = ems.createModelElement(MInputPart.class); - partB.setInputURI("http://www.eclipse.org"); - detachedWindow.getChildren().add(partB); - detachedWindow.setSelectedElement(partB); - - MInputPart partC = ems.createModelElement(MInputPart.class); - partC.setInputURI("http://www.eclipse.org"); - detachedWindow.getChildren().add(partC); - - initialize(); - getEngine().createGui(window); - - EPartService partService = window.getContext().get(EPartService.class); - Collection<MInputPart> parts = partService.getInputParts("http://www.eclipse.org"); - assertEquals(3, parts.size()); - assertTrue(parts.contains(partA)); - assertTrue(parts.contains(partB)); - assertTrue(parts.contains(partC)); - } - - @Test - public void testGetInputParts_Bug334559_02() { - MWindow window = ems.createModelElement(MWindow.class); - application.getChildren().add(window); - application.setSelectedElement(window); - - MPerspectiveStack perspectiveStack = ems.createModelElement(MPerspectiveStack.class); - window.getChildren().add(perspectiveStack); - window.setSelectedElement(perspectiveStack); - - MPerspective perspective = ems.createModelElement(MPerspective.class); - perspectiveStack.getChildren().add(perspective); - perspectiveStack.setSelectedElement(perspective); - - MInputPart partA = ems.createModelElement(MInputPart.class); - partA.setInputURI("http://www.eclipse.org"); - window.getChildren().add(partA); - - MWindow detachedWindow = ems.createModelElement(MWindow.class); - perspective.getWindows().add(detachedWindow); - - MInputPart partB = ems.createModelElement(MInputPart.class); - partB.setInputURI("http://www.eclipse.org"); - detachedWindow.getChildren().add(partB); - detachedWindow.setSelectedElement(partB); - - MInputPart partC = ems.createModelElement(MInputPart.class); - partC.setInputURI("http://www.eclipse.org"); - detachedWindow.getChildren().add(partC); - - initialize(); - getEngine().createGui(window); - - EPartService partService = window.getContext().get(EPartService.class); - Collection<MInputPart> parts = partService.getInputParts("http://www.eclipse.org"); - assertEquals(3, parts.size()); - assertTrue(parts.contains(partA)); - assertTrue(parts.contains(partB)); - assertTrue(parts.contains(partC)); - } - - @Test - public void testGetInputParts() { - final String uri1 = "file:///a.txt"; - final String uri2 = "file:///b.txt"; - - MWindow window = ems.createModelElement(MWindow.class); - application.getChildren().add(window); - application.setSelectedElement(window); - - MPart part = ems.createModelElement(MPart.class); - window.getChildren().add(part); - - MInputPart inputPart = ems.createModelElement(MInputPart.class); - inputPart.setInputURI(uri1); - window.getChildren().add(inputPart); - - part = ems.createModelElement(MPart.class); - window.getChildren().add(part); - - inputPart = ems.createModelElement(MInputPart.class); - inputPart.setInputURI(uri2); - window.getChildren().add(inputPart); - - inputPart = ems.createModelElement(MInputPart.class); - inputPart.setInputURI(uri1); - window.getChildren().add(inputPart); - - part = ems.createModelElement(MPart.class); - window.getChildren().add(part); - - initialize(); - getEngine().createGui(window); - - EPartService partService = window.getContext().get(EPartService.class); - assertEquals(6, partService.getParts().size()); - assertEquals(2, partService.getInputParts(uri1).size()); - assertEquals(1, partService.getInputParts(uri2).size()); - assertEquals(0, partService.getInputParts("totally unknown").size()); - try { - partService.getInputParts(null); - fail("Passing null should throw an AssertionFailedException"); - } catch (AssertionFailedException e) { - } - } @Test public void testGetActivePart() { diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/ModelRobustnessTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/ModelRobustnessTest.java index 0f7ff1713c9..c60918ce75a 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/ModelRobustnessTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/application/ModelRobustnessTest.java @@ -55,11 +55,9 @@ public class ModelRobustnessTest { assertEquals(2, w.getChildren().size()); MPartStack stack = (MPartStack) w.getChildren().get(0); assertEquals("window1.partstack1", stack.getElementId()); - assertEquals(2, stack.getChildren().size()); + assertEquals(1, stack.getChildren().size()); assertEquals("window1.partstack1.part1", stack.getChildren().get(0) .getElementId()); - assertEquals("window1.partstack1.inputpart1", stack.getChildren() - .get(1).getElementId()); stack = (MPartStack) w.getChildren().get(1); assertEquals("window1.partstack2", stack.getElementId()); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/util/TestSwitch.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/util/TestSwitch.java index 4b447f63615..49ff887cf04 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/util/TestSwitch.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/model/test/util/TestSwitch.java @@ -94,8 +94,6 @@ public class TestSwitch<T1> extends Switch<T1> { if (result == null) result = caseParameter(testHarness); if (result == null) - result = caseInput(testHarness); - if (result == null) result = caseUILabel(testHarness); if (result == null) result = caseDirtyable(testHarness); diff --git a/tests/org.eclipse.e4.ui.tests/xmi/InvalidContainment.e4xmi b/tests/org.eclipse.e4.ui.tests/xmi/InvalidContainment.e4xmi index 0308c74383c..a6d724465ff 100644 --- a/tests/org.eclipse.e4.ui.tests/xmi/InvalidContainment.e4xmi +++ b/tests/org.eclipse.e4.ui.tests/xmi/InvalidContainment.e4xmi @@ -7,7 +7,6 @@ <children xsi:type="basic:PartSashContainer" elementId="window1.partstack1.partsashcontainer1"/> <children xsi:type="basic:Part" elementId="window1.partstack1.part1"/> <children xsi:type="basic:PartSashContainer" elementId="window1.partstack1.partsashcontainer2"/> - <children xsi:type="basic:InputPart" elementId="window1.partstack1.inputpart1"/> </children> <children xsi:type="basic:PartStack" elementId="window1.partstack2"> <children xsi:type="basic:Part" elementId="window1.partstack2.part1"/> |