aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-11-13 10:41:58 (EST)
committerGerrit Code Review @ Eclipse.org2013-11-14 08:40:01 (EST)
commit2b33bfa2e241ec0647a2d3bbd2e1c0070f970a1b (patch)
tree74f02ac7441968d59a9e2dac38c45be2267bf022
parentbd62f7afa7781790faa650edd46f0c5b459b2b88 (diff)
downloadeclipse.platform.ui-2b33bfa2e241ec0647a2d3bbd2e1c0070f970a1b.zip
eclipse.platform.ui-2b33bfa2e241ec0647a2d3bbd2e1c0070f970a1b.tar.gz
eclipse.platform.ui-2b33bfa2e241ec0647a2d3bbd2e1c0070f970a1b.tar.bz2
bug 421462: [Model] Enable representation of dialogs and wizards in therefs/changes/43/18343/2
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore26
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java19
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java35
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java35
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java3
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java1
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MInput.java1
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MBasicFactory.java18
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MCompositePart.java4
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MDialog.java31
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MInputPart.java1
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWizardDialog.java31
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicFactoryImpl.java22
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java788
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/CompositePartImpl.java19
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/DialogImpl.java46
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WizardDialogImpl.java46
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicAdapterFactory.java36
-rw-r--r--bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/util/BasicSwitch.java66
21 files changed, 1196 insertions, 38 deletions
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
index 5bf76a4..9f5565a 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
+++ b/bundles/org.eclipse.e4.ui.model.workbench/model/UIElements.ecore
@@ -30,6 +30,12 @@
<details key="documentation" value="&lt;p>&#xD;&#xA;&lt;strong>Developers&lt;/strong>:&#xD;&#xA;Add more detailed documentation by editing this comment in &#xD;&#xA;org.eclipse.ui.model.workbench/model/UIElements.ecore. &#xD;&#xA;There is a GenModel/documentation node under each type and attribute.&#xD;&#xA;&lt;/p>"/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="dialogs" upperBound="-1"
+ eType="#//ui/basic/Dialog">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This is the ordered list of MDialogs for this model.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.1"/>
+ </eAnnotations>
+ </eStructuralFeatures>
<eGenericSuperTypes eClassifier="#//ui/ElementContainer">
<eTypeArguments eClassifier="#//ui/basic/Window"/>
</eGenericSuperTypes>
@@ -360,7 +366,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Input" abstract="true" interface="true">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;This class should be mixed into UI elements such as InputParts that need to &#xD;&#xA;reference an external resource (files...).&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This class should be mixed into UI elements such as InputParts that need to &#xD;&#xA;reference an external resource (files...).&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0&#xD;&#xA;@deprecated No longer used"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="inputURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -938,14 +944,18 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CompositePart" eSuperTypes="#//ui/basic/Part #//ui/basic/PartSashContainer">
+ <eClassifiers xsi:type="ecore:EClass" name="CompositePart">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="&lt;p>&#xD;&#xA;This is a Part that is capable of supporting an internal structure. In order to be useful instances of this part muct be capable&#xD;&#xA;of managing their internal structure.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.1&#xD;&#xA;"/>
</eAnnotations>
+ <eGenericSuperTypes eClassifier="#//ui/basic/Part"/>
+ <eGenericSuperTypes eClassifier="#//ui/GenericTile">
+ <eTypeArguments eClassifier="#//ui/basic/PartSashContainerElement"/>
+ </eGenericSuperTypes>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InputPart" eSuperTypes="#//ui/basic/Part #//ui/Input">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&lt;p>&#xD;&#xA;This is a subclass of Part that allows tracking of an 'input'. While originally defined as&#xD;&#xA;a type of 'editor' it turns out that it may well be better to just use a regular Part and&#xD;&#xA;to store what would be the input as an entry on the Part's 'persistentData' map.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
+ <details key="documentation" value="&lt;p>&#xD;&#xA;This is a subclass of Part that allows tracking of an 'input'. While originally defined as&#xD;&#xA;a type of 'editor' it turns out that it may well be better to just use a regular Part and&#xD;&#xA;to store what would be the input as an entry on the Part's 'persistentData' map.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0&#xD;&#xA;@deprecated Use Part instead."/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="PartStack">
@@ -1072,6 +1082,16 @@
<details key="documentation" value="&lt;p>&#xD;&#xA;A class to be mixed in to any element that should be allowed to be added to a&#xD;&#xA;PartStack.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.0"/>
</eAnnotations>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Dialog" eSuperTypes="#//ui/basic/Window">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="&lt;p>&#xD;&#xA;A subclass of Window representing a dialog.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.1"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="WizardDialog" eSuperTypes="#//ui/basic/Dialog">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="&lt;p>&#xD;&#xA;A subclass of Window representing a wizard dialog.&#xD;&#xA;&lt;/p>&#xD;&#xA;@since 1.1"/>
+ </eAnnotations>
+ </eClassifiers>
</eSubpackages>
<eSubpackages name="advanced" nsURI="http://www.eclipse.org/ui/2010/UIModel/application/ui/advanced"
nsPrefix="advanced">
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java
index 563d0d4..61a5200 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/MApplication.java
@@ -20,6 +20,7 @@ import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorConta
import org.eclipse.e4.ui.model.application.ui.MContext;
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
import org.eclipse.e4.ui.model.application.ui.MSnippetContainer;
+import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
import org.eclipse.e4.ui.model.application.ui.menu.MMenuContributions;
import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContributions;
@@ -55,6 +56,7 @@ import org.eclipse.e4.ui.model.application.ui.menu.MTrimContributions;
* <li>{@link org.eclipse.e4.ui.model.application.MApplication#getCommands <em>Commands</em>}</li>
* <li>{@link org.eclipse.e4.ui.model.application.MApplication#getAddons <em>Addons</em>}</li>
* <li>{@link org.eclipse.e4.ui.model.application.MApplication#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.e4.ui.model.application.MApplication#getDialogs <em>Dialogs</em>}</li>
* </ul>
* </p>
*
@@ -118,4 +120,21 @@ public interface MApplication extends MElementContainer<MWindow>, MContext, MHan
*/
List<MCategory> getCategories();
+ /**
+ * Returns the value of the '<em><b>Dialogs</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.e4.ui.model.application.ui.basic.MDialog}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * <p>
+ * This is the ordered list of MDialogs for this model.
+ * </p>
+ * @since 1.1
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Dialogs</em>' reference list.
+ * @model
+ * @generated
+ */
+ List<MDialog> getDialogs();
+
} // MApplication
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java
index d1b7842..29cf81c 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationElementImpl.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
import org.eclipse.emf.ecore.util.EcoreEMap;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -44,7 +43,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
*
* @generated
*/
-public abstract class ApplicationElementImpl extends Container implements MApplicationElement {
+public abstract class ApplicationElementImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements MApplicationElement {
/**
* The default value of the '{@link #getElementId() <em>Element Id</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java
index 9dbd66c..0624237 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.e4.ui.model.application.descriptor.basic.impl.BasicPackageImp
import org.eclipse.e4.ui.model.application.ui.MContext;
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.basic.MDialog;
import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
import org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl;
import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;
@@ -78,6 +79,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getCommands <em>Commands</em>}</li>
* <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getAddons <em>Addons</em>}</li>
* <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getCategories <em>Categories</em>}</li>
+ * <li>{@link org.eclipse.e4.ui.model.application.impl.ApplicationImpl#getDialogs <em>Dialogs</em>}</li>
* </ul>
* </p>
*
@@ -245,6 +247,16 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA
protected EList<MCategory> categories;
/**
+ * The cached value of the '{@link #getDialogs() <em>Dialogs</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDialogs()
+ * @generated
+ * @ordered
+ */
+ protected EList<MDialog> dialogs;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -482,6 +494,18 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA
* <!-- end-user-doc -->
* @generated
*/
+ public List<MDialog> getDialogs() {
+ if (dialogs == null) {
+ dialogs = new EObjectResolvingEList<MDialog>(MDialog.class, this, ApplicationPackageImpl.APPLICATION__DIALOGS);
+ }
+ return dialogs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
@@ -552,6 +576,8 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA
return getAddons();
case ApplicationPackageImpl.APPLICATION__CATEGORIES:
return getCategories();
+ case ApplicationPackageImpl.APPLICATION__DIALOGS:
+ return getDialogs();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -623,6 +649,10 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA
getCategories().clear();
getCategories().addAll((Collection<? extends MCategory>)newValue);
return;
+ case ApplicationPackageImpl.APPLICATION__DIALOGS:
+ getDialogs().clear();
+ getDialogs().addAll((Collection<? extends MDialog>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -680,6 +710,9 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA
case ApplicationPackageImpl.APPLICATION__CATEGORIES:
getCategories().clear();
return;
+ case ApplicationPackageImpl.APPLICATION__DIALOGS:
+ getDialogs().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -722,6 +755,8 @@ public class ApplicationImpl extends ElementContainerImpl<MWindow> implements MA
return addons != null && !addons.isEmpty();
case ApplicationPackageImpl.APPLICATION__CATEGORIES:
return categories != null && !categories.isEmpty();
+ case ApplicationPackageImpl.APPLICATION__DIALOGS:
+ return dialogs != null && !dialogs.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java
index b384ba3..3bc7393 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/ApplicationPackageImpl.java
@@ -497,13 +497,22 @@ public class ApplicationPackageImpl extends EPackageImpl {
public static final int APPLICATION__CATEGORIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14;
/**
+ * The feature id for the '<em><b>Dialogs</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int APPLICATION__DIALOGS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15;
+
+ /**
* The number of structural features of the '<em>Application</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int APPLICATION_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15;
+ public static final int APPLICATION_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 16;
/**
* The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation.
@@ -985,6 +994,20 @@ public class ApplicationPackageImpl extends EPackageImpl {
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.e4.ui.model.application.MApplication#getDialogs <em>Dialogs</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Dialogs</em>'.
+ * @see org.eclipse.e4.ui.model.application.MApplication#getDialogs()
+ * @see #getApplication()
+ * @generated
+ */
+ public EReference getApplication_Dialogs() {
+ return (EReference)applicationEClass.getEStructuralFeatures().get(3);
+ }
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.MApplicationElement <em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1208,6 +1231,7 @@ public class ApplicationPackageImpl extends EPackageImpl {
createEReference(applicationEClass, APPLICATION__COMMANDS);
createEReference(applicationEClass, APPLICATION__ADDONS);
createEReference(applicationEClass, APPLICATION__CATEGORIES);
+ createEReference(applicationEClass, APPLICATION__DIALOGS);
applicationElementEClass = createEClass(APPLICATION_ELEMENT);
createEAttribute(applicationElementEClass, APPLICATION_ELEMENT__ELEMENT_ID);
@@ -1304,6 +1328,7 @@ public class ApplicationPackageImpl extends EPackageImpl {
initEReference(getApplication_Commands(), theCommandsPackage.getCommand(), null, "commands", null, 0, -1, MApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getApplication_Addons(), this.getAddon(), null, "addons", null, 0, -1, MApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getApplication_Categories(), theCommandsPackage.getCategory(), null, "categories", null, 0, -1, MApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getApplication_Dialogs(), theBasicPackage.getDialog(), null, "dialogs", null, 0, -1, MApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(applicationElementEClass, MApplicationElement.class, "ApplicationElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEAttribute(getApplicationElement_ElementId(), ecorePackage.getEString(), "elementId", null, 0, 1, MApplicationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
@@ -1403,6 +1428,14 @@ public class ApplicationPackageImpl extends EPackageImpl {
public static final EReference APPLICATION__CATEGORIES = eINSTANCE.getApplication_Categories();
/**
+ * The meta object literal for the '<em><b>Dialogs</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EReference APPLICATION__DIALOGS = eINSTANCE.getApplication_Dialogs();
+
+ /**
* The meta object literal for the '{@link org.eclipse.e4.ui.model.application.impl.ApplicationElementImpl <em>Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java
index d9afeb6..049079e 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToObjectMapImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
/**
* <!-- begin-user-doc -->
@@ -32,7 +31,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
*
* @generated
*/
-public class StringToObjectMapImpl extends Container implements BasicEMap.Entry<String,Object> {
+public class StringToObjectMapImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements BasicEMap.Entry<String,Object> {
/**
* The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java
index 0e1e4dd..ef3439b 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/impl/StringToStringMapImpl.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.common.util.EMap;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
/**
* <!-- begin-user-doc -->
@@ -32,7 +31,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container;
*
* @generated
*/
-public class StringToStringMapImpl extends Container implements BasicEMap.Entry<String,String> {
+public class StringToStringMapImpl extends org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container implements BasicEMap.Entry<String,String> {
/**
* The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java
index 0d0e5c6..26393ea 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MElementContainer.java
@@ -46,7 +46,6 @@ import java.util.List;
public interface MElementContainer<T extends MUIElement> extends MUIElement {
/**
* Returns the value of the '<em><b>Children</b></em>' containment reference list.
- * The list contents are of type {@link T}.
* It is bidirectional and its opposite is '{@link org.eclipse.e4.ui.model.application.ui.MUIElement#getParent <em>Parent</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MInput.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MInput.java
index 60df7f6..fdc499b 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MInput.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/MInput.java
@@ -22,6 +22,7 @@ package org.eclipse.e4.ui.model.application.ui;
* reference an external resource (files...).
* </p>
* @since 1.0
+ * @deprecated No longer used
* <!-- end-model-doc -->
*
* <p>
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 25897d9..983c64b 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
@@ -102,4 +102,22 @@ public interface MBasicFactory {
*/
MTrimBar createTrimBar();
+ /**
+ * Returns a new object of class '<em>Dialog</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Dialog</em>'.
+ * @generated
+ */
+ MDialog createDialog();
+
+ /**
+ * Returns a new object of class '<em>Wizard Dialog</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Wizard Dialog</em>'.
+ * @generated
+ */
+ MWizardDialog createWizardDialog();
+
} //MBasicFactory
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MCompositePart.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MCompositePart.java
index 1ff5f1f..beb0f62 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MCompositePart.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MCompositePart.java
@@ -10,6 +10,8 @@
*/
package org.eclipse.e4.ui.model.application.ui.basic;
+import org.eclipse.e4.ui.model.application.ui.MGenericTile;
+
/**
* <!-- begin-user-doc -->
@@ -29,5 +31,5 @@ package org.eclipse.e4.ui.model.application.ui.basic;
* @model
* @generated
*/
-public interface MCompositePart extends MPart, MPartSashContainer {
+public interface MCompositePart extends MPart, MGenericTile<MPartSashContainerElement> {
} // MCompositePart
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MDialog.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MDialog.java
new file mode 100644
index 0000000..7f34e34
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MDialog.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2008, 2013 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;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Dialog</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * <p>
+ * A subclass of Window representing a dialog.
+ * </p>
+ * @since 1.1
+ * <!-- end-model-doc -->
+ *
+ *
+ * @model
+ * @generated
+ */
+public interface MDialog extends MWindow {
+} // MDialog
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 49907ec..fc06fb6 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
@@ -24,6 +24,7 @@ import org.eclipse.e4.ui.model.application.ui.MInput;
* to store what would be the input as an entry on the Part's 'persistentData' map.
* </p>
* @since 1.0
+ * @deprecated Use Part instead.
* <!-- end-model-doc -->
*
*
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWizardDialog.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWizardDialog.java
new file mode 100644
index 0000000..d58aaf5
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/MWizardDialog.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2008, 2013 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;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Wizard Dialog</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * <p>
+ * A subclass of Window representing a wizard dialog.
+ * </p>
+ * @since 1.1
+ * <!-- end-model-doc -->
+ *
+ *
+ * @model
+ * @generated
+ */
+public interface MWizardDialog extends MDialog {
+} // MWizardDialog
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 d0745ab..1015d4e 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
@@ -77,6 +77,8 @@ public class BasicFactoryImpl extends EFactoryImpl implements MBasicFactory {
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$
}
@@ -167,6 +169,26 @@ public class BasicFactoryImpl extends EFactoryImpl implements MBasicFactory {
* <!-- end-user-doc -->
* @generated
*/
+ public MDialog createDialog() {
+ DialogImpl dialog = new DialogImpl();
+ return dialog;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public MWizardDialog createWizardDialog() {
+ WizardDialogImpl wizardDialog = new WizardDialogImpl();
+ return wizardDialog;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public BasicPackageImpl getBasicPackage() {
return (BasicPackageImpl)getEPackage();
}
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 25d9f31..aad0445 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
@@ -15,6 +15,7 @@ import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
import org.eclipse.e4.ui.model.application.ui.advanced.impl.AdvancedPackageImpl;
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;
@@ -26,6 +27,7 @@ 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.impl.UiPackageImpl;
import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuPackageImpl;
import org.eclipse.emf.ecore.EAttribute;
@@ -3122,6 +3124,710 @@ public class BasicPackageImpl extends EPackageImpl {
public static final int STACK_ELEMENT_OPERATION_COUNT = UiPackageImpl.UI_ELEMENT_OPERATION_COUNT + 0;
/**
+ * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.DialogImpl <em>Dialog</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.DialogImpl
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl#getDialog()
+ * @generated
+ */
+ public static final int DIALOG = 12;
+
+ /**
+ * The feature id for the '<em><b>Element Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__ELEMENT_ID = WINDOW__ELEMENT_ID;
+
+ /**
+ * The feature id for the '<em><b>Persisted State</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__PERSISTED_STATE = WINDOW__PERSISTED_STATE;
+
+ /**
+ * The feature id for the '<em><b>Tags</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__TAGS = WINDOW__TAGS;
+
+ /**
+ * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__CONTRIBUTOR_URI = WINDOW__CONTRIBUTOR_URI;
+
+ /**
+ * The feature id for the '<em><b>Transient Data</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__TRANSIENT_DATA = WINDOW__TRANSIENT_DATA;
+
+ /**
+ * The feature id for the '<em><b>Widget</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__WIDGET = WINDOW__WIDGET;
+
+ /**
+ * The feature id for the '<em><b>Renderer</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__RENDERER = WINDOW__RENDERER;
+
+ /**
+ * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__TO_BE_RENDERED = WINDOW__TO_BE_RENDERED;
+
+ /**
+ * The feature id for the '<em><b>On Top</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__ON_TOP = WINDOW__ON_TOP;
+
+ /**
+ * The feature id for the '<em><b>Visible</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__VISIBLE = WINDOW__VISIBLE;
+
+ /**
+ * The feature id for the '<em><b>Parent</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__PARENT = WINDOW__PARENT;
+
+ /**
+ * The feature id for the '<em><b>Container Data</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__CONTAINER_DATA = WINDOW__CONTAINER_DATA;
+
+ /**
+ * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__CUR_SHARED_REF = WINDOW__CUR_SHARED_REF;
+
+ /**
+ * The feature id for the '<em><b>Visible When</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__VISIBLE_WHEN = WINDOW__VISIBLE_WHEN;
+
+ /**
+ * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__ACCESSIBILITY_PHRASE = WINDOW__ACCESSIBILITY_PHRASE;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__CHILDREN = WINDOW__CHILDREN;
+
+ /**
+ * The feature id for the '<em><b>Selected Element</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__SELECTED_ELEMENT = WINDOW__SELECTED_ELEMENT;
+
+ /**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__LABEL = WINDOW__LABEL;
+
+ /**
+ * The feature id for the '<em><b>Icon URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__ICON_URI = WINDOW__ICON_URI;
+
+ /**
+ * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__TOOLTIP = WINDOW__TOOLTIP;
+
+ /**
+ * The feature id for the '<em><b>Context</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__CONTEXT = WINDOW__CONTEXT;
+
+ /**
+ * The feature id for the '<em><b>Variables</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__VARIABLES = WINDOW__VARIABLES;
+
+ /**
+ * The feature id for the '<em><b>Properties</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__PROPERTIES = WINDOW__PROPERTIES;
+
+ /**
+ * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__HANDLERS = WINDOW__HANDLERS;
+
+ /**
+ * The feature id for the '<em><b>Binding Contexts</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__BINDING_CONTEXTS = WINDOW__BINDING_CONTEXTS;
+
+ /**
+ * The feature id for the '<em><b>Snippets</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__SNIPPETS = WINDOW__SNIPPETS;
+
+ /**
+ * The feature id for the '<em><b>Main Menu</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__MAIN_MENU = WINDOW__MAIN_MENU;
+
+ /**
+ * The feature id for the '<em><b>X</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__X = WINDOW__X;
+
+ /**
+ * The feature id for the '<em><b>Y</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__Y = WINDOW__Y;
+
+ /**
+ * The feature id for the '<em><b>Width</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__WIDTH = WINDOW__WIDTH;
+
+ /**
+ * The feature id for the '<em><b>Height</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__HEIGHT = WINDOW__HEIGHT;
+
+ /**
+ * The feature id for the '<em><b>Windows</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__WINDOWS = WINDOW__WINDOWS;
+
+ /**
+ * The feature id for the '<em><b>Shared Elements</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG__SHARED_ELEMENTS = WINDOW__SHARED_ELEMENTS;
+
+ /**
+ * The number of structural features of the '<em>Dialog</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG_FEATURE_COUNT = WINDOW_FEATURE_COUNT + 0;
+
+ /**
+ * The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG___GET_LOCALIZED_ACCESSIBILITY_PHRASE = WINDOW___GET_LOCALIZED_ACCESSIBILITY_PHRASE;
+
+ /**
+ * The operation id for the '<em>Get Localized Label</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG___GET_LOCALIZED_LABEL = WINDOW___GET_LOCALIZED_LABEL;
+
+ /**
+ * The operation id for the '<em>Get Localized Tooltip</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG___GET_LOCALIZED_TOOLTIP = WINDOW___GET_LOCALIZED_TOOLTIP;
+
+ /**
+ * The number of operations of the '<em>Dialog</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int DIALOG_OPERATION_COUNT = WINDOW_OPERATION_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WizardDialogImpl <em>Wizard Dialog</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.WizardDialogImpl
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl#getWizardDialog()
+ * @generated
+ */
+ public static final int WIZARD_DIALOG = 13;
+
+ /**
+ * The feature id for the '<em><b>Element Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__ELEMENT_ID = DIALOG__ELEMENT_ID;
+
+ /**
+ * The feature id for the '<em><b>Persisted State</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__PERSISTED_STATE = DIALOG__PERSISTED_STATE;
+
+ /**
+ * The feature id for the '<em><b>Tags</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__TAGS = DIALOG__TAGS;
+
+ /**
+ * The feature id for the '<em><b>Contributor URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__CONTRIBUTOR_URI = DIALOG__CONTRIBUTOR_URI;
+
+ /**
+ * The feature id for the '<em><b>Transient Data</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__TRANSIENT_DATA = DIALOG__TRANSIENT_DATA;
+
+ /**
+ * The feature id for the '<em><b>Widget</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__WIDGET = DIALOG__WIDGET;
+
+ /**
+ * The feature id for the '<em><b>Renderer</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__RENDERER = DIALOG__RENDERER;
+
+ /**
+ * The feature id for the '<em><b>To Be Rendered</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__TO_BE_RENDERED = DIALOG__TO_BE_RENDERED;
+
+ /**
+ * The feature id for the '<em><b>On Top</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__ON_TOP = DIALOG__ON_TOP;
+
+ /**
+ * The feature id for the '<em><b>Visible</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__VISIBLE = DIALOG__VISIBLE;
+
+ /**
+ * The feature id for the '<em><b>Parent</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__PARENT = DIALOG__PARENT;
+
+ /**
+ * The feature id for the '<em><b>Container Data</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__CONTAINER_DATA = DIALOG__CONTAINER_DATA;
+
+ /**
+ * The feature id for the '<em><b>Cur Shared Ref</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__CUR_SHARED_REF = DIALOG__CUR_SHARED_REF;
+
+ /**
+ * The feature id for the '<em><b>Visible When</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__VISIBLE_WHEN = DIALOG__VISIBLE_WHEN;
+
+ /**
+ * The feature id for the '<em><b>Accessibility Phrase</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__ACCESSIBILITY_PHRASE = DIALOG__ACCESSIBILITY_PHRASE;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__CHILDREN = DIALOG__CHILDREN;
+
+ /**
+ * The feature id for the '<em><b>Selected Element</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__SELECTED_ELEMENT = DIALOG__SELECTED_ELEMENT;
+
+ /**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__LABEL = DIALOG__LABEL;
+
+ /**
+ * The feature id for the '<em><b>Icon URI</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__ICON_URI = DIALOG__ICON_URI;
+
+ /**
+ * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__TOOLTIP = DIALOG__TOOLTIP;
+
+ /**
+ * The feature id for the '<em><b>Context</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__CONTEXT = DIALOG__CONTEXT;
+
+ /**
+ * The feature id for the '<em><b>Variables</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__VARIABLES = DIALOG__VARIABLES;
+
+ /**
+ * The feature id for the '<em><b>Properties</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__PROPERTIES = DIALOG__PROPERTIES;
+
+ /**
+ * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__HANDLERS = DIALOG__HANDLERS;
+
+ /**
+ * The feature id for the '<em><b>Binding Contexts</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__BINDING_CONTEXTS = DIALOG__BINDING_CONTEXTS;
+
+ /**
+ * The feature id for the '<em><b>Snippets</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__SNIPPETS = DIALOG__SNIPPETS;
+
+ /**
+ * The feature id for the '<em><b>Main Menu</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__MAIN_MENU = DIALOG__MAIN_MENU;
+
+ /**
+ * The feature id for the '<em><b>X</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__X = DIALOG__X;
+
+ /**
+ * The feature id for the '<em><b>Y</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__Y = DIALOG__Y;
+
+ /**
+ * The feature id for the '<em><b>Width</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__WIDTH = DIALOG__WIDTH;
+
+ /**
+ * The feature id for the '<em><b>Height</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__HEIGHT = DIALOG__HEIGHT;
+
+ /**
+ * The feature id for the '<em><b>Windows</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__WINDOWS = DIALOG__WINDOWS;
+
+ /**
+ * The feature id for the '<em><b>Shared Elements</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG__SHARED_ELEMENTS = DIALOG__SHARED_ELEMENTS;
+
+ /**
+ * The number of structural features of the '<em>Wizard Dialog</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG_FEATURE_COUNT = DIALOG_FEATURE_COUNT + 0;
+
+ /**
+ * The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG___GET_LOCALIZED_ACCESSIBILITY_PHRASE = DIALOG___GET_LOCALIZED_ACCESSIBILITY_PHRASE;
+
+ /**
+ * The operation id for the '<em>Get Localized Label</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG___GET_LOCALIZED_LABEL = DIALOG___GET_LOCALIZED_LABEL;
+
+ /**
+ * The operation id for the '<em>Get Localized Tooltip</em>' operation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG___GET_LOCALIZED_TOOLTIP = DIALOG___GET_LOCALIZED_TOOLTIP;
+
+ /**
+ * The number of operations of the '<em>Wizard Dialog</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int WIZARD_DIALOG_OPERATION_COUNT = DIALOG_OPERATION_COUNT + 0;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -3206,6 +3912,20 @@ public class BasicPackageImpl extends EPackageImpl {
private EClass stackElementEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass dialogEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass wizardDialogEClass = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -3619,6 +4339,32 @@ public class BasicPackageImpl extends EPackageImpl {
/**
+ * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.basic.MDialog <em>Dialog</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Dialog</em>'.
+ * @see org.eclipse.e4.ui.model.application.ui.basic.MDialog
+ * @generated
+ */
+ public EClass getDialog() {
+ return dialogEClass;
+ }
+
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog <em>Wizard Dialog</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Wizard Dialog</em>'.
+ * @see org.eclipse.e4.ui.model.application.ui.basic.MWizardDialog
+ * @generated
+ */
+ public EClass getWizardDialog() {
+ return wizardDialogEClass;
+ }
+
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3685,6 +4431,10 @@ public class BasicPackageImpl extends EPackageImpl {
createEReference(trimBarEClass, TRIM_BAR__PENDING_CLEANUP);
stackElementEClass = createEClass(STACK_ELEMENT);
+
+ dialogEClass = createEClass(DIALOG);
+
+ wizardDialogEClass = createEClass(WIZARD_DIALOG);
}
/**
@@ -3731,12 +4481,16 @@ public class BasicPackageImpl extends EPackageImpl {
partEClass.getESuperTypes().add(theUiPackage.getDirtyable());
partEClass.getESuperTypes().add(theCommandsPackage.getBindings());
partEClass.getESuperTypes().add(this.getWindowElement());
- compositePartEClass.getESuperTypes().add(this.getPart());
- compositePartEClass.getESuperTypes().add(this.getPartSashContainer());
+ EGenericType g1 = createEGenericType(this.getPart());
+ compositePartEClass.getEGenericSuperTypes().add(g1);
+ g1 = createEGenericType(theUiPackage.getGenericTile());
+ EGenericType g2 = createEGenericType(this.getPartSashContainerElement());
+ g1.getETypeArguments().add(g2);
+ compositePartEClass.getEGenericSuperTypes().add(g1);
inputPartEClass.getESuperTypes().add(this.getPart());
inputPartEClass.getESuperTypes().add(theUiPackage.getInput());
- EGenericType g1 = createEGenericType(theUiPackage.getGenericStack());
- EGenericType g2 = createEGenericType(this.getStackElement());
+ g1 = createEGenericType(theUiPackage.getGenericStack());
+ g2 = createEGenericType(this.getStackElement());
g1.getETypeArguments().add(g2);
partStackEClass.getEGenericSuperTypes().add(g1);
g1 = createEGenericType(this.getPartSashContainerElement());
@@ -3776,6 +4530,8 @@ public class BasicPackageImpl extends EPackageImpl {
g1 = createEGenericType(theUiPackage.getUIElement());
trimBarEClass.getEGenericSuperTypes().add(g1);
stackElementEClass.getESuperTypes().add(theUiPackage.getUIElement());
+ dialogEClass.getESuperTypes().add(this.getWindow());
+ wizardDialogEClass.getESuperTypes().add(this.getDialog());
// Initialize classes, features, and operations; add parameters
initEClass(partEClass, MPart.class, "Part", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -3816,6 +4572,10 @@ public class BasicPackageImpl extends EPackageImpl {
initEReference(getTrimBar_PendingCleanup(), this.getTrimElement(), null, "pendingCleanup", null, 0, -1, MTrimBar.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEClass(stackElementEClass, MStackElement.class, "StackElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(dialogEClass, MDialog.class, "Dialog", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+ initEClass(wizardDialogEClass, MWizardDialog.class, "WizardDialog", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
}
/**
@@ -4063,6 +4823,26 @@ public class BasicPackageImpl extends EPackageImpl {
*/
public static final EClass STACK_ELEMENT = eINSTANCE.getStackElement();
+ /**
+ * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.DialogImpl <em>Dialog</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.DialogImpl
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl#getDialog()
+ * @generated
+ */
+ public static final EClass DIALOG = eINSTANCE.getDialog();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WizardDialogImpl <em>Wizard Dialog</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.WizardDialogImpl
+ * @see org.eclipse.e4.ui.model.application.ui.basic.impl.BasicPackageImpl#getWizardDialog()
+ * @generated
+ */
+ public static final EClass WIZARD_DIALOG = eINSTANCE.getWizardDialog();
+
}
} //BasicPackageImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/CompositePartImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/CompositePartImpl.java
index 4f51da6..564d566 100644
--- a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/CompositePartImpl.java
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/CompositePartImpl.java
@@ -12,28 +12,19 @@ package org.eclipse.e4.ui.model.application.ui.basic.impl;
import java.util.Collection;
import java.util.List;
-
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
import org.eclipse.e4.ui.model.application.ui.MGenericTile;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
-
import org.eclipse.e4.ui.model.application.ui.basic.MCompositePart;
-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.impl.UiPackageImpl;
-
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
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.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
@@ -313,11 +304,6 @@ public class CompositePartImpl extends PartImpl implements MCompositePart {
default: return -1;
}
}
- if (baseClass == MPartSashContainer.class) {
- switch (derivedFeatureID) {
- default: return -1;
- }
- }
return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
}
@@ -341,11 +327,6 @@ public class CompositePartImpl extends PartImpl implements MCompositePart {
default: return -1;
}
}
- if (baseClass == MPartSashContainer.class) {
- switch (baseFeatureID) {
- default: return -1;
- }
- }
return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
}
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/DialogImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/DialogImpl.java
new file mode 100644
index 0000000..6b7bbc0
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/DialogImpl.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2008, 2013 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.basic.MDialog;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Dialog</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class DialogImpl extends WindowImpl implements MDialog {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected DialogImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return BasicPackageImpl.Literals.DIALOG;
+ }
+
+} //DialogImpl
diff --git a/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WizardDialogImpl.java b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WizardDialogImpl.java
new file mode 100644
index 0000000..0eec91c
--- /dev/null
+++ b/bundles/org.eclipse.e4.ui.model.workbench/src/org/eclipse/e4/ui/model/application/ui/basic/impl/WizardDialogImpl.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2008, 2013 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.basic.MWizardDialog;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Wizard Dialog</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class WizardDialogImpl extends DialogImpl implements MWizardDialog {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected WizardDialogImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return BasicPackageImpl.Literals.WIZARD_DIALOG;
+ }
+
+} //WizardDialogImpl
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 ae8944e..aeb0749 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
@@ -136,6 +136,14 @@ public class BasicAdapterFactory extends AdapterFactoryImpl {
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();
}
@@ -380,6 +388,34 @@ 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 -->
+ * @return the new adapter.
+ * @see org.eclipse.e4.ui.model.application.ui.basic.MDialog
+ * @generated
+ */
+ public Adapter createDialogAdapter() {
+ return null;
+ }
+
+ /**
+ * 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
+ * @generated
+ */
+ public Adapter createWizardDialogAdapter() {
+ return null;
+ }
+
+ /**
* 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;
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 afafe02..9bd93d5 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
@@ -108,7 +108,7 @@ public class BasicSwitch<T1> extends Switch<T1> {
MCompositePart compositePart = (MCompositePart)theEObject;
T1 result = caseCompositePart(compositePart);
if (result == null) result = casePart(compositePart);
- if (result == null) result = casePartSashContainer(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);
@@ -118,10 +118,9 @@ public class BasicSwitch<T1> extends Switch<T1> {
if (result == null) result = caseDirtyable(compositePart);
if (result == null) result = caseBindings(compositePart);
if (result == null) result = caseWindowElement(compositePart);
- if (result == null) result = caseGenericTile(compositePart);
- if (result == null) result = caseApplicationElement(compositePart);
if (result == null) result = caseElementContainer(compositePart);
if (result == null) result = caseUIElement(compositePart);
+ if (result == null) result = caseApplicationElement(compositePart);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -239,6 +238,37 @@ public class BasicSwitch<T1> extends Switch<T1> {
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 = 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 = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -424,6 +454,36 @@ public class BasicSwitch<T1> extends Switch<T1> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Dialog</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>Dialog</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T1 caseDialog(MDialog object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Wizard Dialog</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>Wizard Dialog</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T1 caseWizardDialog(MWizardDialog object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>Element</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;