@@ -14,6 +14,7 @@
<genClasses ecoreClass="metaQuestionnaire.ecore#//Titre"/>
<genClasses ecoreClass="metaQuestionnaire.ecore#//Depart">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute metaQuestionnaire.ecore#//Depart/nom"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute metaQuestionnaire.ecore#//Depart/text"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metaQuestionnaire.ecore#//Depart/firstEtape"/>
</genClasses>
<genClasses ecoreClass="metaQuestionnaire.ecore#//Arrive">
@@ -44,6 +45,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute metaQuestionnaire.ecore#//Question/intitule"/>
</genClasses>
<genClasses ecoreClass="metaQuestionnaire.ecore#//Etape"/>
<genClasses ecoreClass="metaQuestionnaire.ecore#//FirstEtape"/>
<genClasses ecoreClass="metaQuestionnaire.ecore#//FollowingEtape"/>
<genClasses ecoreClass="metaQuestionnaire.ecore#//Reponse"/>
<genClasses ecoreClass="metaQuestionnaire.ecore#//ReponseRedirigable">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metaQuestionnaire.ecore#//ReponseRedirigable/questionRedirect"/>

Large diffs are not rendered by default.

@@ -176,26 +176,6 @@
</compartments>
</ownedChild>
</nodes>
<nodes>
<containmentFeature
href="metaQuestionnaire.ecore#//Questionnaire/titre"/>
<ownedChild>
<domainMetaElement
href="metaQuestionnaire.ecore#//Titre"/>
<labelMappings
xsi:type="gmfmap:FeatureLabelMapping">
<diagramLabel
href="metaQuestionnaire.gmfgraph#TitreLabel"/>
<features
href="metaQuestionnaire.ecore#//ElementAvecNom/nom"/>
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
href="metaQuestionnaire.gmftool#//@palette/@tools.0/@tools.12"/>
<diagramNode
href="metaQuestionnaire.gmfgraph#Titre"/>
</ownedChild>
</nodes>
<nodes>
<containmentFeature
href="metaQuestionnaire.ecore#//Questionnaire/dep"/>
@@ -258,6 +238,26 @@
href="metaQuestionnaire.gmfgraph#Arrive"/>
</ownedChild>
</nodes>
<nodes>
<containmentFeature
href="metaQuestionnaire.ecore#//Questionnaire/titre"/>
<ownedChild>
<domainMetaElement
href="metaQuestionnaire.ecore#//Titre"/>
<labelMappings
xsi:type="gmfmap:FeatureLabelMapping">
<diagramLabel
href="metaQuestionnaire.gmfgraph#TitreLabel"/>
<features
href="metaQuestionnaire.ecore#//ElementAvecNom/nom"/>
</labelMappings>
<tool
xsi:type="gmftool:CreationTool"
href="metaQuestionnaire.gmftool#//@palette/@tools.0/@tools.12"/>
<diagramNode
href="metaQuestionnaire.gmfgraph#Titre"/>
</ownedChild>
</nodes>
<links>
<labelMappings
xsi:type="gmfmap:DesignLabelMapping"
@@ -19,7 +19,7 @@
* @model annotation="gmf.node label='nom' label.text='Arrivee' label.readOnly='true'"
* @generated
*/
public interface Arrive extends Etape {
public interface Arrive extends FollowingEtape {
/**
* Returns the value of the '<em><b>Nom</b></em>' attribute.
* The default value is <code>"Arrivee"</code>.
@@ -12,6 +12,7 @@
* The following features are supported:
* <ul>
* <li>{@link questionnaire.Depart#getNom <em>Nom</em>}</li>
* <li>{@link questionnaire.Depart#getText <em>Text</em>}</li>
* <li>{@link questionnaire.Depart#getFirstEtape <em>First Etape</em>}</li>
* </ul>
* </p>
@@ -20,7 +21,7 @@
* @model annotation="gmf.node label='nom' label.text='Depart' label.readOnly='true'"
* @generated
*/
public interface Depart extends Etape {
public interface Depart extends FirstEtape {
/**
* Returns the value of the '<em><b>Nom</b></em>' attribute.
* The default value is <code>"Depart"</code>.
@@ -48,6 +49,32 @@ public interface Depart extends Etape {
*/
void setNom(String value);

/**
* Returns the value of the '<em><b>Text</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Text</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Text</em>' attribute.
* @see #setText(String)
* @see questionnaire.QuestionnairePackage#getDepart_Text()
* @model
* @generated
*/
String getText();

/**
* Sets the value of the '{@link questionnaire.Depart#getText <em>Text</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Text</em>' attribute.
* @see #getText()
* @generated
*/
void setText(String value);

/**
* Returns the value of the '<em><b>First Etape</b></em>' reference.
* <!-- begin-user-doc -->
@@ -20,7 +20,7 @@
* @model annotation="gmf.node label='intitule'"
* @generated
*/
public interface Question extends Etape {
public interface Question extends FollowingEtape {
/**
* Returns the value of the '<em><b>Next Etape</b></em>' reference.
* <!-- begin-user-doc -->
@@ -30,12 +30,12 @@ public interface Question extends Etape {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Next Etape</em>' reference.
* @see #setNextEtape(Etape)
* @see #setNextEtape(FollowingEtape)
* @see questionnaire.QuestionnairePackage#getQuestion_NextEtape()
* @model annotation="gmf.link target.decoration='arrow'"
* @generated
*/
Etape getNextEtape();
FollowingEtape getNextEtape();

/**
* Sets the value of the '{@link questionnaire.Question#getNextEtape <em>Next Etape</em>}' reference.
@@ -45,7 +45,7 @@ public interface Question extends Etape {
* @see #getNextEtape()
* @generated
*/
void setNextEtape(Etape value);
void setNextEtape(FollowingEtape value);

/**
* Returns the value of the '<em><b>Intitule</b></em>' attribute.
@@ -138,6 +138,24 @@ public interface QuestionnaireFactory extends EFactory {
*/
Etape createEtape();

/**
* Returns a new object of class '<em>First Etape</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>First Etape</em>'.
* @generated
*/
FirstEtape createFirstEtape();

/**
* Returns a new object of class '<em>Following Etape</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>Following Etape</em>'.
* @generated
*/
FollowingEtape createFollowingEtape();

/**
* Returns a new object of class '<em>Reponse</em>'.
* <!-- begin-user-doc -->
@@ -63,7 +63,7 @@ public interface QuestionnairePackage extends EPackage {
* @see questionnaire.impl.QuestionnairePackageImpl#getElementAvecNom()
* @generated
*/
int ELEMENT_AVEC_NOM = 15;
int ELEMENT_AVEC_NOM = 17;

/**
* The feature id for the '<em><b>Nom</b></em>' attribute.
@@ -194,6 +194,25 @@ public interface QuestionnairePackage extends EPackage {
*/
int ETAPE_FEATURE_COUNT = 0;

/**
* The meta object id for the '{@link questionnaire.impl.FirstEtapeImpl <em>First Etape</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see questionnaire.impl.FirstEtapeImpl
* @see questionnaire.impl.QuestionnairePackageImpl#getFirstEtape()
* @generated
*/
int FIRST_ETAPE = 13;

/**
* The number of structural features of the '<em>First Etape</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int FIRST_ETAPE_FEATURE_COUNT = ETAPE_FEATURE_COUNT + 0;

/**
* The meta object id for the '{@link questionnaire.impl.DepartImpl <em>Depart</em>}' class.
* <!-- begin-user-doc -->
@@ -211,7 +230,16 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int DEPART__NOM = ETAPE_FEATURE_COUNT + 0;
int DEPART__NOM = FIRST_ETAPE_FEATURE_COUNT + 0;

/**
* The feature id for the '<em><b>Text</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int DEPART__TEXT = FIRST_ETAPE_FEATURE_COUNT + 1;

/**
* The feature id for the '<em><b>First Etape</b></em>' reference.
@@ -220,7 +248,7 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int DEPART__FIRST_ETAPE = ETAPE_FEATURE_COUNT + 1;
int DEPART__FIRST_ETAPE = FIRST_ETAPE_FEATURE_COUNT + 2;

/**
* The number of structural features of the '<em>Depart</em>' class.
@@ -229,7 +257,26 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int DEPART_FEATURE_COUNT = ETAPE_FEATURE_COUNT + 2;
int DEPART_FEATURE_COUNT = FIRST_ETAPE_FEATURE_COUNT + 3;

/**
* The meta object id for the '{@link questionnaire.impl.FollowingEtapeImpl <em>Following Etape</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see questionnaire.impl.FollowingEtapeImpl
* @see questionnaire.impl.QuestionnairePackageImpl#getFollowingEtape()
* @generated
*/
int FOLLOWING_ETAPE = 14;

/**
* The number of structural features of the '<em>Following Etape</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int FOLLOWING_ETAPE_FEATURE_COUNT = ETAPE_FEATURE_COUNT + 0;

/**
* The meta object id for the '{@link questionnaire.impl.ArriveImpl <em>Arrive</em>}' class.
@@ -248,7 +295,7 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int ARRIVE__NOM = ETAPE_FEATURE_COUNT + 0;
int ARRIVE__NOM = FOLLOWING_ETAPE_FEATURE_COUNT + 0;

/**
* The number of structural features of the '<em>Arrive</em>' class.
@@ -257,7 +304,7 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int ARRIVE_FEATURE_COUNT = ETAPE_FEATURE_COUNT + 1;
int ARRIVE_FEATURE_COUNT = FOLLOWING_ETAPE_FEATURE_COUNT + 1;

/**
* The meta object id for the '{@link questionnaire.impl.QuestionImpl <em>Question</em>}' class.
@@ -276,7 +323,7 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int QUESTION__NEXT_ETAPE = ETAPE_FEATURE_COUNT + 0;
int QUESTION__NEXT_ETAPE = FOLLOWING_ETAPE_FEATURE_COUNT + 0;

/**
* The feature id for the '<em><b>Intitule</b></em>' attribute.
@@ -285,7 +332,7 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int QUESTION__INTITULE = ETAPE_FEATURE_COUNT + 1;
int QUESTION__INTITULE = FOLLOWING_ETAPE_FEATURE_COUNT + 1;

/**
* The number of structural features of the '<em>Question</em>' class.
@@ -294,7 +341,7 @@ public interface QuestionnairePackage extends EPackage {
* @generated
* @ordered
*/
int QUESTION_FEATURE_COUNT = ETAPE_FEATURE_COUNT + 2;
int QUESTION_FEATURE_COUNT = FOLLOWING_ETAPE_FEATURE_COUNT + 2;

/**
* The meta object id for the '{@link questionnaire.impl.QuestionOuverteImpl <em>Question Ouverte</em>}' class.
@@ -478,7 +525,7 @@ public interface QuestionnairePackage extends EPackage {
* @see questionnaire.impl.QuestionnairePackageImpl#getReponse()
* @generated
*/
int REPONSE = 13;
int REPONSE = 15;

/**
* The number of structural features of the '<em>Reponse</em>' class.
@@ -525,7 +572,7 @@ public interface QuestionnairePackage extends EPackage {
* @see questionnaire.impl.QuestionnairePackageImpl#getReponseRedirigable()
* @generated
*/
int REPONSE_REDIRIGABLE = 14;
int REPONSE_REDIRIGABLE = 16;

/**
* The feature id for the '<em><b>Question Redirect</b></em>' reference.
@@ -742,6 +789,17 @@ public interface QuestionnairePackage extends EPackage {
*/
EAttribute getDepart_Nom();

/**
* Returns the meta object for the attribute '{@link questionnaire.Depart#getText <em>Text</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Text</em>'.
* @see questionnaire.Depart#getText()
* @see #getDepart()
* @generated
*/
EAttribute getDepart_Text();

/**
* Returns the meta object for the reference '{@link questionnaire.Depart#getFirstEtape <em>First Etape</em>}'.
* <!-- begin-user-doc -->
@@ -963,6 +1021,26 @@ public interface QuestionnairePackage extends EPackage {
*/
EClass getEtape();

/**
* Returns the meta object for class '{@link questionnaire.FirstEtape <em>First Etape</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>First Etape</em>'.
* @see questionnaire.FirstEtape
* @generated
*/
EClass getFirstEtape();

/**
* Returns the meta object for class '{@link questionnaire.FollowingEtape <em>Following Etape</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Following Etape</em>'.
* @see questionnaire.FollowingEtape
* @generated
*/
EClass getFollowingEtape();

/**
* Returns the meta object for class '{@link questionnaire.Reponse <em>Reponse</em>}'.
* <!-- begin-user-doc -->
@@ -1107,6 +1185,14 @@ interface Literals {
*/
EAttribute DEPART__NOM = eINSTANCE.getDepart_Nom();

/**
* The meta object literal for the '<em><b>Text</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EAttribute DEPART__TEXT = eINSTANCE.getDepart_Text();

/**
* The meta object literal for the '<em><b>First Etape</b></em>' reference feature.
* <!-- begin-user-doc -->
@@ -1295,6 +1381,26 @@ interface Literals {
*/
EClass ETAPE = eINSTANCE.getEtape();

/**
* The meta object literal for the '{@link questionnaire.impl.FirstEtapeImpl <em>First Etape</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see questionnaire.impl.FirstEtapeImpl
* @see questionnaire.impl.QuestionnairePackageImpl#getFirstEtape()
* @generated
*/
EClass FIRST_ETAPE = eINSTANCE.getFirstEtape();

/**
* The meta object literal for the '{@link questionnaire.impl.FollowingEtapeImpl <em>Following Etape</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see questionnaire.impl.FollowingEtapeImpl
* @see questionnaire.impl.QuestionnairePackageImpl#getFollowingEtape()
* @generated
*/
EClass FOLLOWING_ETAPE = eINSTANCE.getFollowingEtape();

/**
* The meta object literal for the '{@link questionnaire.impl.ReponseImpl <em>Reponse</em>}' class.
* <!-- begin-user-doc -->
@@ -24,7 +24,7 @@
*
* @generated
*/
public class ArriveImpl extends EtapeImpl implements Arrive {
public class ArriveImpl extends FollowingEtapeImpl implements Arrive {
/**
* The default value of the '{@link #getNom() <em>Nom</em>}' attribute.
* <!-- begin-user-doc -->
@@ -21,13 +21,14 @@
* The following features are implemented:
* <ul>
* <li>{@link questionnaire.impl.DepartImpl#getNom <em>Nom</em>}</li>
* <li>{@link questionnaire.impl.DepartImpl#getText <em>Text</em>}</li>
* <li>{@link questionnaire.impl.DepartImpl#getFirstEtape <em>First Etape</em>}</li>
* </ul>
* </p>
*
* @generated
*/
public class DepartImpl extends EtapeImpl implements Depart {
public class DepartImpl extends FirstEtapeImpl implements Depart {
/**
* The default value of the '{@link #getNom() <em>Nom</em>}' attribute.
* <!-- begin-user-doc -->
@@ -48,6 +49,26 @@ public class DepartImpl extends EtapeImpl implements Depart {
*/
protected String nom = NOM_EDEFAULT;

/**
* The default value of the '{@link #getText() <em>Text</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getText()
* @generated
* @ordered
*/
protected static final String TEXT_EDEFAULT = null;

/**
* The cached value of the '{@link #getText() <em>Text</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #getText()
* @generated
* @ordered
*/
protected String text = TEXT_EDEFAULT;

/**
* The cached value of the '{@link #getFirstEtape() <em>First Etape</em>}' reference.
* <!-- begin-user-doc -->
@@ -98,6 +119,27 @@ public void setNom(String newNom) {
eNotify(new ENotificationImpl(this, Notification.SET, QuestionnairePackage.DEPART__NOM, oldNom, nom));
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public String getText() {
return text;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public void setText(String newText) {
String oldText = text;
text = newText;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, QuestionnairePackage.DEPART__TEXT, oldText, text));
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -146,6 +188,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case QuestionnairePackage.DEPART__NOM:
return getNom();
case QuestionnairePackage.DEPART__TEXT:
return getText();
case QuestionnairePackage.DEPART__FIRST_ETAPE:
if (resolve) return getFirstEtape();
return basicGetFirstEtape();
@@ -164,6 +208,9 @@ public void eSet(int featureID, Object newValue) {
case QuestionnairePackage.DEPART__NOM:
setNom((String)newValue);
return;
case QuestionnairePackage.DEPART__TEXT:
setText((String)newValue);
return;
case QuestionnairePackage.DEPART__FIRST_ETAPE:
setFirstEtape((Etape)newValue);
return;
@@ -182,6 +229,9 @@ public void eUnset(int featureID) {
case QuestionnairePackage.DEPART__NOM:
setNom(NOM_EDEFAULT);
return;
case QuestionnairePackage.DEPART__TEXT:
setText(TEXT_EDEFAULT);
return;
case QuestionnairePackage.DEPART__FIRST_ETAPE:
setFirstEtape((Etape)null);
return;
@@ -199,6 +249,8 @@ public boolean eIsSet(int featureID) {
switch (featureID) {
case QuestionnairePackage.DEPART__NOM:
return NOM_EDEFAULT == null ? nom != null : !NOM_EDEFAULT.equals(nom);
case QuestionnairePackage.DEPART__TEXT:
return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
case QuestionnairePackage.DEPART__FIRST_ETAPE:
return firstEtape != null;
}
@@ -217,6 +269,8 @@ public String toString() {
StringBuffer result = new StringBuffer(super.toString());
result.append(" (nom: ");
result.append(nom);
result.append(", text: ");
result.append(text);
result.append(')');
return result.toString();
}
@@ -10,6 +10,7 @@
import org.eclipse.emf.ecore.impl.ENotificationImpl;

import questionnaire.Etape;
import questionnaire.FollowingEtape;
import questionnaire.Question;
import questionnaire.QuestionnairePackage;

@@ -27,7 +28,7 @@
*
* @generated
*/
public class QuestionImpl extends EtapeImpl implements Question {
public class QuestionImpl extends FollowingEtapeImpl implements Question {
/**
* The cached value of the '{@link #getNextEtape() <em>Next Etape</em>}' reference.
* <!-- begin-user-doc -->
@@ -36,7 +37,7 @@ public class QuestionImpl extends EtapeImpl implements Question {
* @generated
* @ordered
*/
protected Etape nextEtape;
protected FollowingEtape nextEtape;

/**
* The default value of the '{@link #getIntitule() <em>Intitule</em>}' attribute.
@@ -82,10 +83,10 @@ protected EClass eStaticClass() {
* <!-- end-user-doc -->
* @generated
*/
public Etape getNextEtape() {
public FollowingEtape getNextEtape() {
if (nextEtape != null && nextEtape.eIsProxy()) {
InternalEObject oldNextEtape = (InternalEObject)nextEtape;
nextEtape = (Etape)eResolveProxy(oldNextEtape);
nextEtape = (FollowingEtape)eResolveProxy(oldNextEtape);
if (nextEtape != oldNextEtape) {
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.RESOLVE, QuestionnairePackage.QUESTION__NEXT_ETAPE, oldNextEtape, nextEtape));
@@ -99,7 +100,7 @@ public Etape getNextEtape() {
* <!-- end-user-doc -->
* @generated
*/
public Etape basicGetNextEtape() {
public FollowingEtape basicGetNextEtape() {
return nextEtape;
}

@@ -108,8 +109,8 @@ public Etape basicGetNextEtape() {
* <!-- end-user-doc -->
* @generated
*/
public void setNextEtape(Etape newNextEtape) {
Etape oldNextEtape = nextEtape;
public void setNextEtape(FollowingEtape newNextEtape) {
FollowingEtape oldNextEtape = nextEtape;
nextEtape = newNextEtape;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, QuestionnairePackage.QUESTION__NEXT_ETAPE, oldNextEtape, nextEtape));
@@ -162,7 +163,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case QuestionnairePackage.QUESTION__NEXT_ETAPE:
setNextEtape((Etape)newValue);
setNextEtape((FollowingEtape)newValue);
return;
case QuestionnairePackage.QUESTION__INTITULE:
setIntitule((String)newValue);
@@ -180,7 +181,7 @@ public void eSet(int featureID, Object newValue) {
public void eUnset(int featureID) {
switch (featureID) {
case QuestionnairePackage.QUESTION__NEXT_ETAPE:
setNextEtape((Etape)null);
setNextEtape((FollowingEtape)null);
return;
case QuestionnairePackage.QUESTION__INTITULE:
setIntitule(INTITULE_EDEFAULT);
@@ -69,6 +69,8 @@ public EObject create(EClass eClass) {
case QuestionnairePackage.REPONSE_CHOIX: return createReponseChoix();
case QuestionnairePackage.QUESTION: return createQuestion();
case QuestionnairePackage.ETAPE: return createEtape();
case QuestionnairePackage.FIRST_ETAPE: return createFirstEtape();
case QuestionnairePackage.FOLLOWING_ETAPE: return createFollowingEtape();
case QuestionnairePackage.REPONSE: return createReponse();
case QuestionnairePackage.REPONSE_REDIRIGABLE: return createReponseRedirigable();
case QuestionnairePackage.ELEMENT_AVEC_NOM: return createElementAvecNom();
@@ -207,6 +209,26 @@ public Etape createEtape() {
return etape;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public FirstEtape createFirstEtape() {
FirstEtapeImpl firstEtape = new FirstEtapeImpl();
return firstEtape;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public FollowingEtape createFollowingEtape() {
FollowingEtapeImpl followingEtape = new FollowingEtapeImpl();
return followingEtape;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -13,6 +13,8 @@
import questionnaire.Depart;
import questionnaire.ElementAvecNom;
import questionnaire.Etape;
import questionnaire.FirstEtape;
import questionnaire.FollowingEtape;
import questionnaire.Question;
import questionnaire.QuestionChoixMultiple;
import questionnaire.QuestionFermee;
@@ -126,6 +128,20 @@ public class QuestionnairePackageImpl extends EPackageImpl implements Questionna
*/
private EClass etapeEClass = null;

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private EClass firstEtapeEClass = null;

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
private EClass followingEtapeEClass = null;

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -280,13 +296,22 @@ public EAttribute getDepart_Nom() {
return (EAttribute)departEClass.getEStructuralFeatures().get(0);
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EAttribute getDepart_Text() {
return (EAttribute)departEClass.getEStructuralFeatures().get(1);
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EReference getDepart_FirstEtape() {
return (EReference)departEClass.getEStructuralFeatures().get(1);
return (EReference)departEClass.getEStructuralFeatures().get(2);
}

/**
@@ -469,6 +494,24 @@ public EClass getEtape() {
return etapeEClass;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EClass getFirstEtape() {
return firstEtapeEClass;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
public EClass getFollowingEtape() {
return followingEtapeEClass;
}

/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -552,6 +595,7 @@ public void createPackageContents() {

departEClass = createEClass(DEPART);
createEAttribute(departEClass, DEPART__NOM);
createEAttribute(departEClass, DEPART__TEXT);
createEReference(departEClass, DEPART__FIRST_ETAPE);

arriveEClass = createEClass(ARRIVE);
@@ -584,6 +628,10 @@ public void createPackageContents() {

etapeEClass = createEClass(ETAPE);

firstEtapeEClass = createEClass(FIRST_ETAPE);

followingEtapeEClass = createEClass(FOLLOWING_ETAPE);

reponseEClass = createEClass(REPONSE);

reponseRedirigableEClass = createEClass(REPONSE_REDIRIGABLE);
@@ -623,8 +671,8 @@ public void initializePackageContents() {
// Add supertypes to classes
questionnaireEClass.getESuperTypes().add(this.getElementAvecNom());
titreEClass.getESuperTypes().add(this.getElementAvecNom());
departEClass.getESuperTypes().add(this.getEtape());
arriveEClass.getESuperTypes().add(this.getEtape());
departEClass.getESuperTypes().add(this.getFirstEtape());
arriveEClass.getESuperTypes().add(this.getFollowingEtape());
questionOuverteEClass.getESuperTypes().add(this.getQuestion());
questionOuverteEClass.getESuperTypes().add(this.getElementAvecNom());
questionFermeeEClass.getESuperTypes().add(this.getQuestion());
@@ -636,7 +684,9 @@ public void initializePackageContents() {
reponseNonEClass.getESuperTypes().add(this.getReponseRedirigable());
reponseChoixEClass.getESuperTypes().add(this.getElementAvecNom());
reponseChoixEClass.getESuperTypes().add(this.getReponseRedirigable());
questionEClass.getESuperTypes().add(this.getEtape());
questionEClass.getESuperTypes().add(this.getFollowingEtape());
firstEtapeEClass.getESuperTypes().add(this.getEtape());
followingEtapeEClass.getESuperTypes().add(this.getEtape());
reponseRedirigableEClass.getESuperTypes().add(this.getReponse());

// Initialize classes and features; add operations and parameters
@@ -650,6 +700,7 @@ public void initializePackageContents() {

initEClass(departEClass, Depart.class, "Depart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getDepart_Nom(), ecorePackage.getEString(), "nom", "Depart", 0, 1, Depart.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDepart_Text(), ecorePackage.getEString(), "text", null, 0, 1, Depart.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getDepart_FirstEtape(), this.getEtape(), null, "firstEtape", null, 0, 1, Depart.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

initEClass(arriveEClass, Arrive.class, "Arrive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -677,11 +728,15 @@ public void initializePackageContents() {
initEClass(reponseChoixEClass, ReponseChoix.class, "ReponseChoix", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

initEClass(questionEClass, Question.class, "Question", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getQuestion_NextEtape(), this.getEtape(), null, "nextEtape", null, 0, 1, Question.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getQuestion_NextEtape(), this.getFollowingEtape(), null, "nextEtape", null, 0, 1, Question.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getQuestion_Intitule(), ecorePackage.getEString(), "intitule", null, 0, 1, Question.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

initEClass(etapeEClass, Etape.class, "Etape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

initEClass(firstEtapeEClass, FirstEtape.class, "FirstEtape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

initEClass(followingEtapeEClass, FollowingEtape.class, "FollowingEtape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

initEClass(reponseEClass, Reponse.class, "Reponse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

initEClass(reponseRedirigableEClass, ReponseRedirigable.class, "ReponseRedirigable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -120,6 +120,14 @@ public Adapter caseEtape(Etape object) {
return createEtapeAdapter();
}
@Override
public Adapter caseFirstEtape(FirstEtape object) {
return createFirstEtapeAdapter();
}
@Override
public Adapter caseFollowingEtape(FollowingEtape object) {
return createFollowingEtapeAdapter();
}
@Override
public Adapter caseReponse(Reponse object) {
return createReponseAdapter();
}
@@ -333,6 +341,34 @@ public Adapter createEtapeAdapter() {
return null;
}

/**
* Creates a new adapter for an object of class '{@link questionnaire.FirstEtape <em>First Etape</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 questionnaire.FirstEtape
* @generated
*/
public Adapter createFirstEtapeAdapter() {
return null;
}

/**
* Creates a new adapter for an object of class '{@link questionnaire.FollowingEtape <em>Following Etape</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 questionnaire.FollowingEtape
* @generated
*/
public Adapter createFollowingEtapeAdapter() {
return null;
}

/**
* Creates a new adapter for an object of class '{@link questionnaire.Reponse <em>Reponse</em>}'.
* <!-- begin-user-doc -->
@@ -83,13 +83,15 @@ protected T doSwitch(int classifierID, EObject theEObject) {
case QuestionnairePackage.DEPART: {
Depart depart = (Depart)theEObject;
T result = caseDepart(depart);
if (result == null) result = caseFirstEtape(depart);
if (result == null) result = caseEtape(depart);
if (result == null) result = defaultCase(theEObject);
return result;
}
case QuestionnairePackage.ARRIVE: {
Arrive arrive = (Arrive)theEObject;
T result = caseArrive(arrive);
if (result == null) result = caseFollowingEtape(arrive);
if (result == null) result = caseEtape(arrive);
if (result == null) result = defaultCase(theEObject);
return result;
@@ -99,6 +101,7 @@ protected T doSwitch(int classifierID, EObject theEObject) {
T result = caseQuestionOuverte(questionOuverte);
if (result == null) result = caseQuestion(questionOuverte);
if (result == null) result = caseElementAvecNom(questionOuverte);
if (result == null) result = caseFollowingEtape(questionOuverte);
if (result == null) result = caseEtape(questionOuverte);
if (result == null) result = defaultCase(theEObject);
return result;
@@ -108,6 +111,7 @@ protected T doSwitch(int classifierID, EObject theEObject) {
T result = caseQuestionFermee(questionFermee);
if (result == null) result = caseQuestion(questionFermee);
if (result == null) result = caseElementAvecNom(questionFermee);
if (result == null) result = caseFollowingEtape(questionFermee);
if (result == null) result = caseEtape(questionFermee);
if (result == null) result = defaultCase(theEObject);
return result;
@@ -117,6 +121,7 @@ protected T doSwitch(int classifierID, EObject theEObject) {
T result = caseQuestionChoixMultiple(questionChoixMultiple);
if (result == null) result = caseQuestion(questionChoixMultiple);
if (result == null) result = caseElementAvecNom(questionChoixMultiple);
if (result == null) result = caseFollowingEtape(questionChoixMultiple);
if (result == null) result = caseEtape(questionChoixMultiple);
if (result == null) result = defaultCase(theEObject);
return result;
@@ -156,6 +161,7 @@ protected T doSwitch(int classifierID, EObject theEObject) {
case QuestionnairePackage.QUESTION: {
Question question = (Question)theEObject;
T result = caseQuestion(question);
if (result == null) result = caseFollowingEtape(question);
if (result == null) result = caseEtape(question);
if (result == null) result = defaultCase(theEObject);
return result;
@@ -166,6 +172,20 @@ protected T doSwitch(int classifierID, EObject theEObject) {
if (result == null) result = defaultCase(theEObject);
return result;
}
case QuestionnairePackage.FIRST_ETAPE: {
FirstEtape firstEtape = (FirstEtape)theEObject;
T result = caseFirstEtape(firstEtape);
if (result == null) result = caseEtape(firstEtape);
if (result == null) result = defaultCase(theEObject);
return result;
}
case QuestionnairePackage.FOLLOWING_ETAPE: {
FollowingEtape followingEtape = (FollowingEtape)theEObject;
T result = caseFollowingEtape(followingEtape);
if (result == null) result = caseEtape(followingEtape);
if (result == null) result = defaultCase(theEObject);
return result;
}
case QuestionnairePackage.REPONSE: {
Reponse reponse = (Reponse)theEObject;
T result = caseReponse(reponse);
@@ -384,6 +404,36 @@ public T caseEtape(Etape object) {
return null;
}

/**
* Returns the result of interpreting the object as an instance of '<em>First Etape</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>First Etape</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
public T caseFirstEtape(FirstEtape object) {
return null;
}

/**
* Returns the result of interpreting the object as an instance of '<em>Following Etape</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>Following Etape</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
public T caseFollowingEtape(FollowingEtape object) {
return null;
}

/**
* Returns the result of interpreting the object as an instance of '<em>Reponse</em>'.
* <!-- begin-user-doc -->