diff options
Diffstat (limited to 'plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf')
27 files changed, 76 insertions, 35 deletions
diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Category.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Category.java index 7e05e9a59..a73091d98 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Category.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Category.java @@ -20,13 +20,13 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.Category#getViews <em>Views</em>}</li> * <li>{@link org.eclipse.emf.eef.views.Category#getRepository <em>Repository</em>}</li> * <li>{@link org.eclipse.emf.eef.views.Category#getCategories <em>Categories</em>}</li> * <li>{@link org.eclipse.emf.eef.views.Category#getName <em>Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getCategory() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Container.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Container.java index 0aea5cca6..ac547d8a4 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Container.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/Container.java @@ -20,10 +20,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.Container#getElements <em>Elements</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getContainer() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/DocumentedElement.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/DocumentedElement.java index 0d9ce929e..bfeb02d6f 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/DocumentedElement.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/DocumentedElement.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.DocumentedElement#getDocumentation <em>Documentation</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getDocumentedElement() * @model abstract="true" diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ElementEditor.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ElementEditor.java index 0cd4c87e7..32a53d0c4 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ElementEditor.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ElementEditor.java @@ -21,12 +21,12 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.ElementEditor#isReadOnly <em>Read Only</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ElementEditor#isNameAsLabel <em>Name As Label</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ElementEditor#getSubElementEditors <em>Sub Element Editors</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getElementEditor() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/IdentifiedElement.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/IdentifiedElement.java index 12168efbb..296017780 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/IdentifiedElement.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/IdentifiedElement.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.IdentifiedElement#getQualifiedIdentifier <em>Qualified Identifier</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getIdentifiedElement() * @model abstract="true" diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/View.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/View.java index c2df183ce..23a50661e 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/View.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/View.java @@ -19,12 +19,12 @@ package org.eclipse.emf.eef.views; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.View#getRepository <em>Repository</em>}</li> * <li>{@link org.eclipse.emf.eef.views.View#isExplicit <em>Explicit</em>}</li> * <li>{@link org.eclipse.emf.eef.views.View#getCategory <em>Category</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getView() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewElement.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewElement.java index ace60dc3d..0003a36c5 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewElement.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewElement.java @@ -20,12 +20,12 @@ import org.eclipse.emf.eef.views.toolkits.Widget; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.ViewElement#getRepresentation <em>Representation</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ViewElement#getContainer <em>Container</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ViewElement#getName <em>Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getViewElement() * @model abstract="true" @@ -112,4 +112,12 @@ public interface ViewElement extends DocumentedElement { */ void setName(String value); + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @model kind="operation" + * @generated + */ + View getContainingView(); + } // ViewElement diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewReference.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewReference.java index 06462e7ac..d4bd83781 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewReference.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewReference.java @@ -19,10 +19,10 @@ package org.eclipse.emf.eef.views; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.ViewReference#getView <em>View</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getViewReference() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewsRepository.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewsRepository.java index 8e5e1deec..30c211fd0 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewsRepository.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/ViewsRepository.java @@ -20,13 +20,13 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.ViewsRepository#getViews <em>Views</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ViewsRepository#getRepositoryKind <em>Repository Kind</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ViewsRepository#getCategories <em>Categories</em>}</li> * <li>{@link org.eclipse.emf.eef.views.ViewsRepository#getName <em>Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.ViewsPackage#getViewsRepository() * @model @@ -62,7 +62,7 @@ public interface ViewsRepository extends DocumentedElement, IdentifiedElement { * <!-- end-user-doc --> * @return the value of the '<em>Repository Kind</em>' attribute list. * @see org.eclipse.emf.eef.views.ViewsPackage#getViewsRepository_RepositoryKind() - * @model + * @model required="true" * @generated */ EList<String> getRepositoryKind(); @@ -96,7 +96,7 @@ public interface ViewsRepository extends DocumentedElement, IdentifiedElement { * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.emf.eef.views.ViewsPackage#getViewsRepository_Name() - * @model + * @model required="true" * @generated */ String getName(); diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java index 3b3364a82..c97744073 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CategoryImpl.java @@ -33,14 +33,15 @@ import org.eclipse.emf.eef.views.ViewsRepository; * An implementation of the model object '<em><b>Category</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getViews <em>Views</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getRepository <em>Repository</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getCategories <em>Categories</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.CategoryImpl#getName <em>Name</em>}</li> * </ul> - * </p> * * @generated */ @@ -123,7 +124,7 @@ public class CategoryImpl extends DocumentedElementImpl implements Category { */ public ViewsRepository getRepository() { if (eContainerFeatureID() != ViewsPackage.CATEGORY__REPOSITORY) return null; - return (ViewsRepository)eContainer(); + return (ViewsRepository)eInternalContainer(); } /** diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ContainerImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ContainerImpl.java index 3a2db55bb..4168b8009 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ContainerImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ContainerImpl.java @@ -30,12 +30,13 @@ import org.eclipse.emf.eef.views.ViewsPackage; * <!-- begin-user-doc --> An implementation of the model object ' * <em><b>Container</b></em>'. <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.ContainerImpl#getQualifiedIdentifier <em>Qualified Identifier</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ContainerImpl#getElements <em>Elements</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomElementEditorImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomElementEditorImpl.java index 05d1cfd5b..ead984093 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomElementEditorImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomElementEditorImpl.java @@ -20,7 +20,6 @@ import org.eclipse.emf.eef.views.ViewsPackage; * An implementation of the model object '<em><b>Custom Element Editor</b></em>'. * <!-- end-user-doc --> * <p> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomViewImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomViewImpl.java index 9f810f0de..7eda24640 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomViewImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/CustomViewImpl.java @@ -20,7 +20,6 @@ import org.eclipse.emf.eef.views.ViewsPackage; * An implementation of the model object '<em><b>Custom View</b></em>'. * <!-- end-user-doc --> * <p> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/DocumentedElementImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/DocumentedElementImpl.java index da9aa4c2d..542906aec 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/DocumentedElementImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/DocumentedElementImpl.java @@ -23,11 +23,12 @@ import org.eclipse.emf.eef.views.ViewsPackage; * An implementation of the model object '<em><b>Documented Element</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.DocumentedElementImpl#getDocumentation <em>Documentation</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java index e4cedffec..582e62d4b 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ElementEditorImpl.java @@ -32,14 +32,15 @@ import org.eclipse.emf.eef.views.ViewsPackage; * An implementation of the model object '<em><b>Element Editor</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#getQualifiedIdentifier <em>Qualified Identifier</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#isReadOnly <em>Read Only</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#isNameAsLabel <em>Name As Label</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ElementEditorImpl#getSubElementEditors <em>Sub Element Editors</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/IdentifiedElementImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/IdentifiedElementImpl.java index a91656d0f..65748a064 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/IdentifiedElementImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/IdentifiedElementImpl.java @@ -21,11 +21,12 @@ import org.eclipse.emf.eef.views.ViewsPackage; * An implementation of the model object '<em><b>Identified Element</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.IdentifiedElementImpl#getQualifiedIdentifier <em>Qualified Identifier</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewElementImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewElementImpl.java index 400e6da69..964bb291c 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewElementImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewElementImpl.java @@ -14,10 +14,13 @@ package org.eclipse.emf.eef.views.impl; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.eef.runtime.editingModel.EClassBinding; import org.eclipse.emf.eef.views.Container; +import org.eclipse.emf.eef.views.View; import org.eclipse.emf.eef.views.ViewElement; import org.eclipse.emf.eef.views.ViewsPackage; import org.eclipse.emf.eef.views.toolkits.Widget; @@ -27,13 +30,14 @@ import org.eclipse.emf.eef.views.toolkits.Widget; * An implementation of the model object '<em><b>View Element</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.ViewElementImpl#getRepresentation <em>Representation</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewElementImpl#getContainer <em>Container</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewElementImpl#getName <em>Name</em>}</li> * </ul> - * </p> * * @generated */ @@ -132,7 +136,7 @@ public abstract class ViewElementImpl extends DocumentedElementImpl implements V */ public Container getContainer() { if (eContainerFeatureID() != ViewsPackage.VIEW_ELEMENT__CONTAINER) return null; - return (Container)eContainer(); + return (Container)eInternalContainer(); } /** @@ -190,6 +194,25 @@ public abstract class ViewElementImpl extends DocumentedElementImpl implements V /** * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @generated not + */ + public View getContainingView() { + if (eContainer() instanceof View) { + return (View) eContainer(); + } + EObject parent = eContainer(); + while (parent.eContainer() != null && !(parent.eContainer() instanceof View)) { + parent = parent.eContainer(); + } + if (parent instanceof View) { + return (View) parent; + } + return null; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ @Override diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java index 267568272..3173e8662 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewImpl.java @@ -30,13 +30,14 @@ import org.eclipse.emf.eef.views.ViewsRepository; * An implementation of the model object '<em><b>View</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.ViewImpl#getRepository <em>Repository</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewImpl#isExplicit <em>Explicit</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewImpl#getCategory <em>Category</em>}</li> * </ul> - * </p> * * @generated */ @@ -107,7 +108,7 @@ public class ViewImpl extends ContainerImpl implements View { */ public ViewsRepository getRepository() { if (eContainerFeatureID() != ViewsPackage.VIEW__REPOSITORY) return null; - return (ViewsRepository)eContainer(); + return (ViewsRepository)eInternalContainer(); } /** @@ -169,7 +170,7 @@ public class ViewImpl extends ContainerImpl implements View { */ public Category getCategory() { if (eContainerFeatureID() != ViewsPackage.VIEW__CATEGORY) return null; - return (Category)eContainer(); + return (Category)eInternalContainer(); } /** diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewReferenceImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewReferenceImpl.java index ad7ebe413..b6c0a235d 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewReferenceImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewReferenceImpl.java @@ -27,12 +27,13 @@ import org.eclipse.emf.eef.views.ViewsPackage; * An implementation of the model object '<em><b>View Reference</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.ViewReferenceImpl#getQualifiedIdentifier <em>Qualified Identifier</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewReferenceImpl#getView <em>View</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsFactoryImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsFactoryImpl.java index 6bc6071e5..1d357fafc 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsFactoryImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsFactoryImpl.java @@ -42,7 +42,7 @@ public class ViewsFactoryImpl extends EFactoryImpl implements ViewsFactory { */ public static ViewsFactory init() { try { - ViewsFactory theViewsFactory = (ViewsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/eef/views/1.0.0"); + ViewsFactory theViewsFactory = (ViewsFactory)EPackage.Registry.INSTANCE.getEFactory(ViewsPackage.eNS_URI); if (theViewsFactory != null) { return theViewsFactory; } diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java index 8c791d3dc..8fa58507f 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsPackageImpl.java @@ -593,9 +593,9 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage { // Initialize classes and features; add operations and parameters initEClass(viewsRepositoryEClass, ViewsRepository.class, "ViewsRepository", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getViewsRepository_Views(), this.getView(), this.getView_Repository(), "views", null, 0, -1, ViewsRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getViewsRepository_RepositoryKind(), ecorePackage.getEString(), "RepositoryKind", null, 0, -1, ViewsRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getViewsRepository_RepositoryKind(), ecorePackage.getEString(), "RepositoryKind", null, 1, -1, ViewsRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getViewsRepository_Categories(), this.getCategory(), this.getCategory_Repository(), "categories", null, 0, -1, ViewsRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getViewsRepository_Name(), ecorePackage.getEString(), "name", null, 0, 1, ViewsRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getViewsRepository_Name(), ecorePackage.getEString(), "name", null, 1, 1, ViewsRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(viewEClass, View.class, "View", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getView_Repository(), this.getViewsRepository(), this.getViewsRepository_Views(), "repository", null, 0, 1, View.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -621,6 +621,8 @@ public class ViewsPackageImpl extends EPackageImpl implements ViewsPackage { initEReference(getViewElement_Container(), this.getContainer(), this.getContainer_Elements(), "container", null, 0, 1, ViewElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getViewElement_Name(), ecorePackage.getEString(), "name", null, 1, 1, ViewElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + addEOperation(viewElementEClass, this.getView(), "getContainingView", 0, 1, IS_UNIQUE, IS_ORDERED); + initEClass(customElementEditorEClass, CustomElementEditor.class, "CustomElementEditor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(customViewEClass, CustomView.class, "CustomView", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsRepositoryImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsRepositoryImpl.java index aa7d8321d..607e89540 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsRepositoryImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/impl/ViewsRepositoryImpl.java @@ -33,7 +33,9 @@ import org.eclipse.emf.eef.views.ViewsRepository; * An implementation of the model object '<em><b>Repository</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.impl.ViewsRepositoryImpl#getQualifiedIdentifier <em>Qualified Identifier</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewsRepositoryImpl#getViews <em>Views</em>}</li> @@ -41,7 +43,6 @@ import org.eclipse.emf.eef.views.ViewsRepository; * <li>{@link org.eclipse.emf.eef.views.impl.ViewsRepositoryImpl#getCategories <em>Categories</em>}</li> * <li>{@link org.eclipse.emf.eef.views.impl.ViewsRepositoryImpl#getName <em>Name</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Toolkit.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Toolkit.java index 81fdbe3df..8fbc59194 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Toolkit.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Toolkit.java @@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.toolkits.Toolkit#getWidgets <em>Widgets</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.Toolkit#getName <em>Name</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.toolkits.ToolkitsPackage#getToolkit() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Widget.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Widget.java index b296a72f0..d64764389 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Widget.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/Widget.java @@ -20,13 +20,13 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.toolkits.Widget#getName <em>Name</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.Widget#getIcon <em>Icon</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.Widget#getImplementation <em>Implementation</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.Widget#getToolkit <em>Toolkit</em>}</li> * </ul> - * </p> * * @see org.eclipse.emf.eef.views.toolkits.ToolkitsPackage#getWidget() * @model diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitImpl.java index 459d40eaa..10cf10171 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitImpl.java @@ -31,12 +31,13 @@ import org.eclipse.emf.eef.views.toolkits.Widget; * An implementation of the model object '<em><b>Toolkit</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.toolkits.impl.ToolkitImpl#getWidgets <em>Widgets</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.impl.ToolkitImpl#getName <em>Name</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitsFactoryImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitsFactoryImpl.java index e5902e879..cd3950039 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitsFactoryImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/ToolkitsFactoryImpl.java @@ -37,7 +37,7 @@ public class ToolkitsFactoryImpl extends EFactoryImpl implements ToolkitsFactory */ public static ToolkitsFactory init() { try { - ToolkitsFactory theToolkitsFactory = (ToolkitsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/eef/views/toolkits/1.0.0"); + ToolkitsFactory theToolkitsFactory = (ToolkitsFactory)EPackage.Registry.INSTANCE.getEFactory(ToolkitsPackage.eNS_URI); if (theToolkitsFactory != null) { return theToolkitsFactory; } diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/WidgetImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/WidgetImpl.java index 5e5dc3c97..9aadd20aa 100644 --- a/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/WidgetImpl.java +++ b/plugins/org.eclipse.emf.eef.runtime.ui/src-gen/org/eclipse/emf/eef/views/toolkits/impl/WidgetImpl.java @@ -27,14 +27,15 @@ import org.eclipse.emf.eef.views.toolkits.Widget; * An implementation of the model object '<em><b>Widget</b></em>'. * <!-- end-user-doc --> * <p> + * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.emf.eef.views.toolkits.impl.WidgetImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.impl.WidgetImpl#getIcon <em>Icon</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.impl.WidgetImpl#getImplementation <em>Implementation</em>}</li> * <li>{@link org.eclipse.emf.eef.views.toolkits.impl.WidgetImpl#getToolkit <em>Toolkit</em>}</li> * </ul> - * </p> * * @generated */ @@ -188,7 +189,7 @@ public class WidgetImpl extends EObjectImpl implements Widget { */ public Toolkit getToolkit() { if (eContainerFeatureID() != ToolkitsPackage.WIDGET__TOOLKIT) return null; - return (Toolkit)eContainer(); + return (Toolkit)eInternalContainer(); } /** |