You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/01/30 12:51:42 UTC

svn commit: r501378 [2/3] - in /incubator/tuscany/java/sdo: impl/src/main/java/org/apache/tuscany/sdo/impl/ tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/ tools/src/test/resources/ tools/templates/models/

Modified: incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java?view=diff&rev=501378&r1=501377&r2=501378
==============================================================================
--- incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java (original)
+++ incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java Tue Jan 30 03:51:41 2007
@@ -728,554 +728,556 @@
   protected final String TEXT_692 = "_set_ = ";
   protected final String TEXT_693 = "_set_;" + NL + "\t\t";
   protected final String TEXT_694 = "_set_ = false;";
-  protected final String TEXT_695 = NL + "\t\tif (isNotifying())" + NL + "\t\t{" + NL + "\t\t\t";
-  protected final String TEXT_696 = " notification = new ";
-  protected final String TEXT_697 = "(this, ";
-  protected final String TEXT_698 = ".UNSET, ";
-  protected final String TEXT_699 = ", ";
-  protected final String TEXT_700 = "isSetChange ? old";
-  protected final String TEXT_701 = " : null";
-  protected final String TEXT_702 = "old";
-  protected final String TEXT_703 = ", null, ";
-  protected final String TEXT_704 = "isSetChange";
-  protected final String TEXT_705 = "old";
-  protected final String TEXT_706 = "_set_";
-  protected final String TEXT_707 = ");" + NL + "\t\t\tif (changeContext == null) changeContext = notification; else changeContext.add(notification);" + NL + "\t\t}" + NL + "\t\treturn changeContext;";
-  protected final String TEXT_708 = NL + "\t\t// TODO: implement this method to unset the contained '";
-  protected final String TEXT_709 = "' ";
-  protected final String TEXT_710 = NL + "\t\t// -> this method is automatically invoked to keep the containment relationship in synch" + NL + "\t\t// -> do not modify other features" + NL + "\t\t// -> return changeContext, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
-  protected final String TEXT_711 = NL + "\t}" + NL;
-  protected final String TEXT_712 = NL + "\t/**" + NL + "\t * Unsets the value of the '{@link ";
-  protected final String TEXT_713 = "#";
-  protected final String TEXT_714 = " <em>";
-  protected final String TEXT_715 = "</em>}' ";
-  protected final String TEXT_716 = "." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";
-  protected final String TEXT_717 = NL + "\t * @see #isSet";
-  protected final String TEXT_718 = "()";
-  protected final String TEXT_719 = NL + "\t * @see #";
-  protected final String TEXT_720 = "()";
-  protected final String TEXT_721 = NL + "\t * @see #set";
-  protected final String TEXT_722 = "(";
-  protected final String TEXT_723 = ")";
-  protected final String TEXT_724 = NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_725 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_726 = NL + "\tvoid unset";
-  protected final String TEXT_727 = "();" + NL;
-  protected final String TEXT_728 = NL + "\tpublic void unset";
-  protected final String TEXT_729 = "()" + NL + "\t{";
-  protected final String TEXT_730 = NL + "\t\tunset(";
-  protected final String TEXT_731 = ");";
-  protected final String TEXT_732 = NL + "\t\t((";
-  protected final String TEXT_733 = ".Unsettable)get";
-  protected final String TEXT_734 = "()).unset();";
-  protected final String TEXT_735 = NL + "\t\t";
-  protected final String TEXT_736 = " ";
-  protected final String TEXT_737 = " = (";
-  protected final String TEXT_738 = ")eVirtualGet(";
-  protected final String TEXT_739 = ");";
-  protected final String TEXT_740 = NL + "\t\tif (";
-  protected final String TEXT_741 = " != null)" + NL + "\t\t{" + NL + "\t\t\tChangeContext changeContext = null;";
-  protected final String TEXT_742 = NL + "\t\t\tchangeContext = ((";
-  protected final String TEXT_743 = ")";
-  protected final String TEXT_744 = ").inverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
-  protected final String TEXT_745 = ", null, changeContext);";
-  protected final String TEXT_746 = NL + "\t\t\tchangeContext = ((";
-  protected final String TEXT_747 = ")";
-  protected final String TEXT_748 = ").inverseRemove(this, ";
-  protected final String TEXT_749 = ", ";
-  protected final String TEXT_750 = ".class, changeContext);";
-  protected final String TEXT_751 = NL + "\t\t\tchangeContext = basicUnset";
-  protected final String TEXT_752 = "(changeContext);" + NL + "\t\t\tif (changeContext != null) dispatch(changeContext);" + NL + "\t\t}" + NL + "\t\telse" + NL + "    \t{";
-  protected final String TEXT_753 = NL + "\t\t\tboolean old";
-  protected final String TEXT_754 = "_set_ = eVirtualIsSet(";
-  protected final String TEXT_755 = ");";
-  protected final String TEXT_756 = NL + "\t\t\tboolean old";
-  protected final String TEXT_757 = "_set_ = (";
-  protected final String TEXT_758 = " & ";
-  protected final String TEXT_759 = "_ESETFLAG) != 0;";
-  protected final String TEXT_760 = NL + "\t\t\t";
-  protected final String TEXT_761 = " &= ~";
-  protected final String TEXT_762 = "_ESETFLAG;";
-  protected final String TEXT_763 = NL + "\t\t\tboolean old";
-  protected final String TEXT_764 = "_set_ = ";
-  protected final String TEXT_765 = "_set_;";
-  protected final String TEXT_766 = NL + "\t\t\t";
-  protected final String TEXT_767 = "_set_ = false;";
-  protected final String TEXT_768 = NL + "\t\t\tif (isNotifying())" + NL + "\t\t\t\tnotify(ChangeKind.UNSET, ";
-  protected final String TEXT_769 = ", null, null, old";
-  protected final String TEXT_770 = "_set_);";
-  protected final String TEXT_771 = NL + "    \t}";
-  protected final String TEXT_772 = NL + "\t\t";
-  protected final String TEXT_773 = " old";
-  protected final String TEXT_774 = " = (";
-  protected final String TEXT_775 = " & ";
-  protected final String TEXT_776 = "_EFLAG) != 0;";
-  protected final String TEXT_777 = NL + "\t\tObject old";
-  protected final String TEXT_778 = " = eVirtualUnset(";
-  protected final String TEXT_779 = ");";
-  protected final String TEXT_780 = NL + "\t\t";
-  protected final String TEXT_781 = " old";
-  protected final String TEXT_782 = " = ";
-  protected final String TEXT_783 = ";";
-  protected final String TEXT_784 = NL + "\t\tboolean isSetChange = old";
-  protected final String TEXT_785 = " != EVIRTUAL_NO_VALUE;";
-  protected final String TEXT_786 = NL + "\t\tboolean old";
-  protected final String TEXT_787 = "_set_ = (";
-  protected final String TEXT_788 = " & ";
-  protected final String TEXT_789 = "_ESETFLAG) != 0;";
-  protected final String TEXT_790 = NL + "\t\tboolean old";
-  protected final String TEXT_791 = "_set_ = ";
-  protected final String TEXT_792 = "_set_;";
-  protected final String TEXT_793 = NL + "\t\t";
-  protected final String TEXT_794 = " = null;";
+  protected final String TEXT_695 = NL + "\t\tif (isNotifying())" + NL + "\t\t{";
+  protected final String TEXT_696 = NL + "\t\t\taddNotification(this, ChangeKind.UNSET, ";
+  protected final String TEXT_697 = ", ";
+  protected final String TEXT_698 = "isSetChange ? null : old";
+  protected final String TEXT_699 = "old";
+  protected final String TEXT_700 = ", null, ";
+  protected final String TEXT_701 = "isSetChange";
+  protected final String TEXT_702 = "!old";
+  protected final String TEXT_703 = "_set_";
+  protected final String TEXT_704 = ", changeContext);";
+  protected final String TEXT_705 = NL + "\t\t\taddNotification(this, ChangeKind.UNSET, ";
+  protected final String TEXT_706 = ", ";
+  protected final String TEXT_707 = "old";
+  protected final String TEXT_708 = " == EVIRTUAL_NO_VALUE ? null : old";
+  protected final String TEXT_709 = "old";
+  protected final String TEXT_710 = ", null, changeContext);";
+  protected final String TEXT_711 = NL + "\t\t}" + NL + "\t\treturn changeContext;";
+  protected final String TEXT_712 = NL + "\t\t// TODO: implement this method to unset the contained '";
+  protected final String TEXT_713 = "' ";
+  protected final String TEXT_714 = NL + "\t\t// -> this method is automatically invoked to keep the containment relationship in synch" + NL + "\t\t// -> do not modify other features" + NL + "\t\t// -> return changeContext, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
+  protected final String TEXT_715 = NL + "\t}" + NL;
+  protected final String TEXT_716 = NL + "\t/**" + NL + "\t * Unsets the value of the '{@link ";
+  protected final String TEXT_717 = "#";
+  protected final String TEXT_718 = " <em>";
+  protected final String TEXT_719 = "</em>}' ";
+  protected final String TEXT_720 = "." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";
+  protected final String TEXT_721 = NL + "\t * @see #isSet";
+  protected final String TEXT_722 = "()";
+  protected final String TEXT_723 = NL + "\t * @see #";
+  protected final String TEXT_724 = "()";
+  protected final String TEXT_725 = NL + "\t * @see #set";
+  protected final String TEXT_726 = "(";
+  protected final String TEXT_727 = ")";
+  protected final String TEXT_728 = NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_729 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_730 = NL + "\tvoid unset";
+  protected final String TEXT_731 = "();" + NL;
+  protected final String TEXT_732 = NL + "\tpublic void unset";
+  protected final String TEXT_733 = "()" + NL + "\t{";
+  protected final String TEXT_734 = NL + "\t\tunset(";
+  protected final String TEXT_735 = ");";
+  protected final String TEXT_736 = NL + "\t\t((";
+  protected final String TEXT_737 = ".Unsettable)get";
+  protected final String TEXT_738 = "()).unset();";
+  protected final String TEXT_739 = NL + "\t\t";
+  protected final String TEXT_740 = " ";
+  protected final String TEXT_741 = " = (";
+  protected final String TEXT_742 = ")eVirtualGet(";
+  protected final String TEXT_743 = ");";
+  protected final String TEXT_744 = NL + "\t\tif (";
+  protected final String TEXT_745 = " != null)" + NL + "\t\t{" + NL + "\t\t\tChangeContext changeContext = null;";
+  protected final String TEXT_746 = NL + "\t\t\tchangeContext = inverseRemove(";
+  protected final String TEXT_747 = ", this, EOPPOSITE_FEATURE_BASE - ";
+  protected final String TEXT_748 = ", null, changeContext);";
+  protected final String TEXT_749 = NL + "\t\t\tchangeContext = inverseRemove(";
+  protected final String TEXT_750 = ", this, ";
+  protected final String TEXT_751 = ", ";
+  protected final String TEXT_752 = ".class, changeContext);";
+  protected final String TEXT_753 = NL + "\t\t\tchangeContext = basicUnset";
+  protected final String TEXT_754 = "(changeContext);" + NL + "\t\t\tif (changeContext != null) dispatch(changeContext);" + NL + "\t\t}" + NL + "\t\telse" + NL + "    \t{";
+  protected final String TEXT_755 = NL + "\t\t\tboolean old";
+  protected final String TEXT_756 = "_set_ = eVirtualIsSet(";
+  protected final String TEXT_757 = ");";
+  protected final String TEXT_758 = NL + "\t\t\tboolean old";
+  protected final String TEXT_759 = "_set_ = (";
+  protected final String TEXT_760 = " & ";
+  protected final String TEXT_761 = "_ESETFLAG) != 0;";
+  protected final String TEXT_762 = NL + "\t\t\t";
+  protected final String TEXT_763 = " &= ~";
+  protected final String TEXT_764 = "_ESETFLAG;";
+  protected final String TEXT_765 = NL + "\t\t\tboolean old";
+  protected final String TEXT_766 = "_set_ = ";
+  protected final String TEXT_767 = "_set_;";
+  protected final String TEXT_768 = NL + "\t\t\t";
+  protected final String TEXT_769 = "_set_ = false;";
+  protected final String TEXT_770 = NL + "\t\t\tif (isNotifying())" + NL + "\t\t\t\tnotify(ChangeKind.UNSET, ";
+  protected final String TEXT_771 = ", null, null, old";
+  protected final String TEXT_772 = "_set_);";
+  protected final String TEXT_773 = NL + "    \t}";
+  protected final String TEXT_774 = NL + "\t\t";
+  protected final String TEXT_775 = " old";
+  protected final String TEXT_776 = " = (";
+  protected final String TEXT_777 = " & ";
+  protected final String TEXT_778 = "_EFLAG) != 0;";
+  protected final String TEXT_779 = NL + "\t\tObject old";
+  protected final String TEXT_780 = " = eVirtualUnset(";
+  protected final String TEXT_781 = ");";
+  protected final String TEXT_782 = NL + "\t\t";
+  protected final String TEXT_783 = " old";
+  protected final String TEXT_784 = " = ";
+  protected final String TEXT_785 = ";";
+  protected final String TEXT_786 = NL + "\t\tboolean isSetChange = old";
+  protected final String TEXT_787 = " != EVIRTUAL_NO_VALUE;";
+  protected final String TEXT_788 = NL + "\t\tboolean old";
+  protected final String TEXT_789 = "_set_ = (";
+  protected final String TEXT_790 = " & ";
+  protected final String TEXT_791 = "_ESETFLAG) != 0;";
+  protected final String TEXT_792 = NL + "\t\tboolean old";
+  protected final String TEXT_793 = "_set_ = ";
+  protected final String TEXT_794 = "_set_;";
   protected final String TEXT_795 = NL + "\t\t";
-  protected final String TEXT_796 = " &= ~";
-  protected final String TEXT_797 = "_ESETFLAG;";
-  protected final String TEXT_798 = NL + "\t\t";
-  protected final String TEXT_799 = "_set_ = false;";
-  protected final String TEXT_800 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, ";
-  protected final String TEXT_801 = ", ";
-  protected final String TEXT_802 = "isSetChange ? old";
-  protected final String TEXT_803 = " : null";
-  protected final String TEXT_804 = "old";
-  protected final String TEXT_805 = ", null, ";
-  protected final String TEXT_806 = "isSetChange";
-  protected final String TEXT_807 = "old";
-  protected final String TEXT_808 = "_set_";
-  protected final String TEXT_809 = ");";
-  protected final String TEXT_810 = NL + "\t\tif (";
-  protected final String TEXT_811 = "_DEFAULT_) ";
-  protected final String TEXT_812 = " |= ";
-  protected final String TEXT_813 = "_EFLAG; else ";
-  protected final String TEXT_814 = " &= ~";
-  protected final String TEXT_815 = "_EFLAG;";
-  protected final String TEXT_816 = NL + "\t\t";
-  protected final String TEXT_817 = " = ";
-  protected final String TEXT_818 = "_DEFAULT_;";
-  protected final String TEXT_819 = NL + "\t\t";
-  protected final String TEXT_820 = " &= ~";
-  protected final String TEXT_821 = "_ESETFLAG;";
-  protected final String TEXT_822 = NL + "\t\t";
-  protected final String TEXT_823 = "_set_ = false;";
-  protected final String TEXT_824 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, ";
-  protected final String TEXT_825 = ", ";
-  protected final String TEXT_826 = "isSetChange ? old";
-  protected final String TEXT_827 = " : ";
-  protected final String TEXT_828 = "_DEFAULT_";
-  protected final String TEXT_829 = "old";
-  protected final String TEXT_830 = ", ";
-  protected final String TEXT_831 = "_DEFAULT_, ";
-  protected final String TEXT_832 = "isSetChange";
-  protected final String TEXT_833 = "old";
-  protected final String TEXT_834 = "_set_";
-  protected final String TEXT_835 = ");";
-  protected final String TEXT_836 = NL + "        unset(get";
-  protected final String TEXT_837 = "(), getType(), ";
-  protected final String TEXT_838 = ");";
-  protected final String TEXT_839 = NL + "        unset";
-  protected final String TEXT_840 = "(get";
-  protected final String TEXT_841 = "());";
-  protected final String TEXT_842 = NL + "\t\t// TODO: implement this method to unset the '";
-  protected final String TEXT_843 = "' ";
-  protected final String TEXT_844 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
-  protected final String TEXT_845 = NL + "\t}" + NL;
-  protected final String TEXT_846 = NL + "\t/**" + NL + "\t * Returns whether the value of the '{@link ";
-  protected final String TEXT_847 = "#";
-  protected final String TEXT_848 = " <em>";
-  protected final String TEXT_849 = "</em>}' ";
-  protected final String TEXT_850 = " is set." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return whether the value of the '<em>";
-  protected final String TEXT_851 = "</em>' ";
-  protected final String TEXT_852 = " is set.";
-  protected final String TEXT_853 = NL + "\t * @see #unset";
-  protected final String TEXT_854 = "()";
-  protected final String TEXT_855 = NL + "\t * @see #";
+  protected final String TEXT_796 = " = null;";
+  protected final String TEXT_797 = NL + "\t\t";
+  protected final String TEXT_798 = " &= ~";
+  protected final String TEXT_799 = "_ESETFLAG;";
+  protected final String TEXT_800 = NL + "\t\t";
+  protected final String TEXT_801 = "_set_ = false;";
+  protected final String TEXT_802 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, ";
+  protected final String TEXT_803 = ", ";
+  protected final String TEXT_804 = "isSetChange ? old";
+  protected final String TEXT_805 = " : null";
+  protected final String TEXT_806 = "old";
+  protected final String TEXT_807 = ", null, ";
+  protected final String TEXT_808 = "isSetChange";
+  protected final String TEXT_809 = "old";
+  protected final String TEXT_810 = "_set_";
+  protected final String TEXT_811 = ");";
+  protected final String TEXT_812 = NL + "\t\tif (";
+  protected final String TEXT_813 = "_DEFAULT_) ";
+  protected final String TEXT_814 = " |= ";
+  protected final String TEXT_815 = "_EFLAG; else ";
+  protected final String TEXT_816 = " &= ~";
+  protected final String TEXT_817 = "_EFLAG;";
+  protected final String TEXT_818 = NL + "\t\t";
+  protected final String TEXT_819 = " = ";
+  protected final String TEXT_820 = "_DEFAULT_;";
+  protected final String TEXT_821 = NL + "\t\t";
+  protected final String TEXT_822 = " &= ~";
+  protected final String TEXT_823 = "_ESETFLAG;";
+  protected final String TEXT_824 = NL + "\t\t";
+  protected final String TEXT_825 = "_set_ = false;";
+  protected final String TEXT_826 = NL + "\t\tif (isNotifying())" + NL + "\t\t\tnotify(ChangeKind.UNSET, ";
+  protected final String TEXT_827 = ", ";
+  protected final String TEXT_828 = "isSetChange ? old";
+  protected final String TEXT_829 = " : ";
+  protected final String TEXT_830 = "_DEFAULT_";
+  protected final String TEXT_831 = "old";
+  protected final String TEXT_832 = ", ";
+  protected final String TEXT_833 = "_DEFAULT_, ";
+  protected final String TEXT_834 = "isSetChange";
+  protected final String TEXT_835 = "old";
+  protected final String TEXT_836 = "_set_";
+  protected final String TEXT_837 = ");";
+  protected final String TEXT_838 = NL + "        unset(get";
+  protected final String TEXT_839 = "(), getType(), ";
+  protected final String TEXT_840 = ");";
+  protected final String TEXT_841 = NL + "        unset";
+  protected final String TEXT_842 = "(get";
+  protected final String TEXT_843 = "());";
+  protected final String TEXT_844 = NL + "\t\t// TODO: implement this method to unset the '";
+  protected final String TEXT_845 = "' ";
+  protected final String TEXT_846 = NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
+  protected final String TEXT_847 = NL + "\t}" + NL;
+  protected final String TEXT_848 = NL + "\t/**" + NL + "\t * Returns whether the value of the '{@link ";
+  protected final String TEXT_849 = "#";
+  protected final String TEXT_850 = " <em>";
+  protected final String TEXT_851 = "</em>}' ";
+  protected final String TEXT_852 = " is set." + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @return whether the value of the '<em>";
+  protected final String TEXT_853 = "</em>' ";
+  protected final String TEXT_854 = " is set.";
+  protected final String TEXT_855 = NL + "\t * @see #unset";
   protected final String TEXT_856 = "()";
-  protected final String TEXT_857 = NL + "\t * @see #set";
-  protected final String TEXT_858 = "(";
-  protected final String TEXT_859 = ")";
-  protected final String TEXT_860 = NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_861 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_862 = NL + "\tboolean isSet";
-  protected final String TEXT_863 = "();" + NL;
-  protected final String TEXT_864 = NL + "\tpublic boolean isSet";
-  protected final String TEXT_865 = "()" + NL + "\t{";
-  protected final String TEXT_866 = NL + "\t\treturn isSet(";
-  protected final String TEXT_867 = ");";
-  protected final String TEXT_868 = NL + "\t\t";
-  protected final String TEXT_869 = " ";
-  protected final String TEXT_870 = " = (";
-  protected final String TEXT_871 = ")eVirtualGet(";
-  protected final String TEXT_872 = ");";
-  protected final String TEXT_873 = NL + "\t\treturn ";
-  protected final String TEXT_874 = " != null && ((";
-  protected final String TEXT_875 = ".Unsettable)";
-  protected final String TEXT_876 = ").isSet();";
-  protected final String TEXT_877 = NL + "\t\treturn eVirtualIsSet(";
-  protected final String TEXT_878 = ");";
-  protected final String TEXT_879 = NL + "\t\treturn (";
-  protected final String TEXT_880 = " & ";
-  protected final String TEXT_881 = "_ESETFLAG) != 0;";
-  protected final String TEXT_882 = NL + "\t\treturn ";
-  protected final String TEXT_883 = "_set_;";
-  protected final String TEXT_884 = NL + "        return isSet(get";
-  protected final String TEXT_885 = "(), getType(), ";
-  protected final String TEXT_886 = ");";
-  protected final String TEXT_887 = NL + "\t\treturn !((";
-  protected final String TEXT_888 = ".Internal)get";
-  protected final String TEXT_889 = "()).isEmpty(";
-  protected final String TEXT_890 = ");";
-  protected final String TEXT_891 = NL + "\t\t// TODO: implement this method to return whether the '";
-  protected final String TEXT_892 = "' ";
-  protected final String TEXT_893 = " is set" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
-  protected final String TEXT_894 = NL + "\t}" + NL;
-  protected final String TEXT_895 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";
-  protected final String TEXT_896 = NL + "\t * <!-- begin-model-doc -->" + NL + "\t * ";
-  protected final String TEXT_897 = NL + "\t * <!-- end-model-doc -->";
-  protected final String TEXT_898 = NL + "\t * @model ";
-  protected final String TEXT_899 = NL + "\t *        ";
-  protected final String TEXT_900 = NL + "\t * @model";
-  protected final String TEXT_901 = NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_902 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_903 = NL + "\t";
-  protected final String TEXT_904 = " ";
-  protected final String TEXT_905 = "(";
-  protected final String TEXT_906 = ")";
-  protected final String TEXT_907 = ";" + NL;
-  protected final String TEXT_908 = NL + "\tpublic ";
-  protected final String TEXT_909 = " ";
-  protected final String TEXT_910 = "(";
-  protected final String TEXT_911 = ")";
-  protected final String TEXT_912 = NL + "\t{";
-  protected final String TEXT_913 = NL + "\t\t";
-  protected final String TEXT_914 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// -> specify the condition that violates the invariant" + NL + "\t\t// -> verify the details of the diagnostic, including severity and message" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tif (false)" + NL + "\t\t{" + NL + "\t\t\tif (";
-  protected final String TEXT_915 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";
-  protected final String TEXT_916 = ".add" + NL + "\t\t\t\t\t(new ";
-  protected final String TEXT_917 = NL + "\t\t\t\t\t\t(";
-  protected final String TEXT_918 = ".ERROR," + NL + "\t\t\t\t\t\t ";
-  protected final String TEXT_919 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";
-  protected final String TEXT_920 = ".";
-  protected final String TEXT_921 = "," + NL + "\t\t\t\t\t\t ";
-  protected final String TEXT_922 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";
-  protected final String TEXT_923 = "\", ";
-  protected final String TEXT_924 = ".getObjectLabel(this, ";
-  protected final String TEXT_925 = ") }),";
-  protected final String TEXT_926 = NL + "\t\t\t\t\t\t new Object [] { this }));" + NL + "\t\t\t}" + NL + "\t\t\treturn false;" + NL + "\t\t}" + NL + "\t\treturn true;";
-  protected final String TEXT_927 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
-  protected final String TEXT_928 = NL + "\t}" + NL;
-  protected final String TEXT_929 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ChangeContext eInverseAdd(";
-  protected final String TEXT_930 = " otherEnd, int propertyIndex, ChangeContext changeContext)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
-  protected final String TEXT_931 = NL + "\t\t\tcase ";
-  protected final String TEXT_932 = ":";
-  protected final String TEXT_933 = NL + "\t\t\t\treturn ((";
-  protected final String TEXT_934 = ")((";
-  protected final String TEXT_935 = ".InternalMapView)";
-  protected final String TEXT_936 = "()).eMap()).basicAdd(otherEnd, changeContext);";
-  protected final String TEXT_937 = NL + "\t\t\t\treturn ((";
-  protected final String TEXT_938 = ")";
-  protected final String TEXT_939 = "()).basicAdd(otherEnd, changeContext);";
-  protected final String TEXT_940 = NL + "\t\t\t\tif (eInternalContainer() != null)" + NL + "\t\t\t\t\tchangeContext = eBasicRemoveFromContainer(changeContext);" + NL + "\t\t\t\treturn eBasicSetContainer(otherEnd, ";
-  protected final String TEXT_941 = ", changeContext);";
-  protected final String TEXT_942 = NL + "\t\t\t\t";
-  protected final String TEXT_943 = " ";
-  protected final String TEXT_944 = " = (";
-  protected final String TEXT_945 = ")eVirtualGet(";
-  protected final String TEXT_946 = ");";
-  protected final String TEXT_947 = NL + "\t\t\t\tif (";
-  protected final String TEXT_948 = " != null)";
-  protected final String TEXT_949 = NL + "\t\t\t\t\tchangeContext = ((";
-  protected final String TEXT_950 = ")";
-  protected final String TEXT_951 = ").inverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
-  protected final String TEXT_952 = ", null, changeContext);";
-  protected final String TEXT_953 = NL + "\t\t\t\t\tchangeContext = ((";
-  protected final String TEXT_954 = ")";
-  protected final String TEXT_955 = ").inverseRemove(this, ";
-  protected final String TEXT_956 = ", ";
-  protected final String TEXT_957 = ".class, changeContext);";
-  protected final String TEXT_958 = NL + "\t\t\t\treturn basicSet";
-  protected final String TEXT_959 = "((";
-  protected final String TEXT_960 = ")otherEnd, changeContext);";
-  protected final String TEXT_961 = NL + "\t\t}";
-  protected final String TEXT_962 = NL + "\t\treturn super.eInverseAdd(otherEnd, propertyIndex, changeContext);";
-  protected final String TEXT_963 = NL + "\t\treturn eDynamicInverseAdd(otherEnd, propertyIndex, changeContext);";
-  protected final String TEXT_964 = NL + "\t}" + NL;
-  protected final String TEXT_965 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ChangeContext inverseRemove(";
-  protected final String TEXT_966 = " otherEnd, int propertyIndex, ChangeContext changeContext)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
-  protected final String TEXT_967 = NL + "\t\t\tcase ";
-  protected final String TEXT_968 = ":";
-  protected final String TEXT_969 = NL + "\t\t\t\treturn ((";
-  protected final String TEXT_970 = ")((";
-  protected final String TEXT_971 = ".InternalMapView)";
-  protected final String TEXT_972 = "()).eMap()).basicRemove(otherEnd, changeContext);";
-  protected final String TEXT_973 = NL + "\t\t\t\treturn removeFrom";
-  protected final String TEXT_974 = "(";
-  protected final String TEXT_975 = "(), otherEnd, changeContext);";
-  protected final String TEXT_976 = NL + "\t\t\t\treturn removeFromList(";
+  protected final String TEXT_857 = NL + "\t * @see #";
+  protected final String TEXT_858 = "()";
+  protected final String TEXT_859 = NL + "\t * @see #set";
+  protected final String TEXT_860 = "(";
+  protected final String TEXT_861 = ")";
+  protected final String TEXT_862 = NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_863 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_864 = NL + "\tboolean isSet";
+  protected final String TEXT_865 = "();" + NL;
+  protected final String TEXT_866 = NL + "\tpublic boolean isSet";
+  protected final String TEXT_867 = "()" + NL + "\t{";
+  protected final String TEXT_868 = NL + "\t\treturn isSet(";
+  protected final String TEXT_869 = ");";
+  protected final String TEXT_870 = NL + "\t\t";
+  protected final String TEXT_871 = " ";
+  protected final String TEXT_872 = " = (";
+  protected final String TEXT_873 = ")eVirtualGet(";
+  protected final String TEXT_874 = ");";
+  protected final String TEXT_875 = NL + "\t\treturn ";
+  protected final String TEXT_876 = " != null && ((";
+  protected final String TEXT_877 = ".Unsettable)";
+  protected final String TEXT_878 = ").isSet();";
+  protected final String TEXT_879 = NL + "\t\treturn eVirtualIsSet(";
+  protected final String TEXT_880 = ");";
+  protected final String TEXT_881 = NL + "\t\treturn (";
+  protected final String TEXT_882 = " & ";
+  protected final String TEXT_883 = "_ESETFLAG) != 0;";
+  protected final String TEXT_884 = NL + "\t\treturn ";
+  protected final String TEXT_885 = "_set_;";
+  protected final String TEXT_886 = NL + "        return isSet(get";
+  protected final String TEXT_887 = "(), getType(), ";
+  protected final String TEXT_888 = ");";
+  protected final String TEXT_889 = NL + "\t\treturn !((";
+  protected final String TEXT_890 = ".Internal)get";
+  protected final String TEXT_891 = "()).isEmpty(";
+  protected final String TEXT_892 = ");";
+  protected final String TEXT_893 = NL + "\t\t// TODO: implement this method to return whether the '";
+  protected final String TEXT_894 = "' ";
+  protected final String TEXT_895 = " is set" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
+  protected final String TEXT_896 = NL + "\t}" + NL;
+  protected final String TEXT_897 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->";
+  protected final String TEXT_898 = NL + "\t * <!-- begin-model-doc -->" + NL + "\t * ";
+  protected final String TEXT_899 = NL + "\t * <!-- end-model-doc -->";
+  protected final String TEXT_900 = NL + "\t * @model ";
+  protected final String TEXT_901 = NL + "\t *        ";
+  protected final String TEXT_902 = NL + "\t * @model";
+  protected final String TEXT_903 = NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_904 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_905 = NL + "\t";
+  protected final String TEXT_906 = " ";
+  protected final String TEXT_907 = "(";
+  protected final String TEXT_908 = ")";
+  protected final String TEXT_909 = ";" + NL;
+  protected final String TEXT_910 = NL + "\tpublic ";
+  protected final String TEXT_911 = " ";
+  protected final String TEXT_912 = "(";
+  protected final String TEXT_913 = ")";
+  protected final String TEXT_914 = NL + "\t{";
+  protected final String TEXT_915 = NL + "\t\t";
+  protected final String TEXT_916 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// -> specify the condition that violates the invariant" + NL + "\t\t// -> verify the details of the diagnostic, including severity and message" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tif (false)" + NL + "\t\t{" + NL + "\t\t\tif (";
+  protected final String TEXT_917 = " != null)" + NL + "\t\t\t{" + NL + "\t\t\t\t";
+  protected final String TEXT_918 = ".add" + NL + "\t\t\t\t\t(new ";
+  protected final String TEXT_919 = NL + "\t\t\t\t\t\t(";
+  protected final String TEXT_920 = ".ERROR," + NL + "\t\t\t\t\t\t ";
+  protected final String TEXT_921 = ".DIAGNOSTIC_SOURCE," + NL + "\t\t\t\t\t\t ";
+  protected final String TEXT_922 = ".";
+  protected final String TEXT_923 = "," + NL + "\t\t\t\t\t\t ";
+  protected final String TEXT_924 = ".INSTANCE.getString(\"_UI_GenericInvariant_diagnostic\", new Object[] { \"";
+  protected final String TEXT_925 = "\", ";
+  protected final String TEXT_926 = ".getObjectLabel(this, ";
+  protected final String TEXT_927 = ") }),";
+  protected final String TEXT_928 = NL + "\t\t\t\t\t\t new Object [] { this }));" + NL + "\t\t\t}" + NL + "\t\t\treturn false;" + NL + "\t\t}" + NL + "\t\treturn true;";
+  protected final String TEXT_929 = NL + "\t\t// TODO: implement this method" + NL + "\t\t// Ensure that you remove @generated or mark it @generated NOT" + NL + "\t\tthrow new UnsupportedOperationException();";
+  protected final String TEXT_930 = NL + "\t}" + NL;
+  protected final String TEXT_931 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ChangeContext eInverseAdd(";
+  protected final String TEXT_932 = " otherEnd, int propertyIndex, ChangeContext changeContext)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
+  protected final String TEXT_933 = NL + "\t\t\tcase ";
+  protected final String TEXT_934 = ":";
+  protected final String TEXT_935 = NL + "\t\t\t\treturn ((";
+  protected final String TEXT_936 = ")((";
+  protected final String TEXT_937 = ".InternalMapView)";
+  protected final String TEXT_938 = "()).eMap()).basicAdd(otherEnd, changeContext);";
+  protected final String TEXT_939 = NL + "\t\t\t\treturn ((";
+  protected final String TEXT_940 = ")";
+  protected final String TEXT_941 = "()).basicAdd(otherEnd, changeContext);";
+  protected final String TEXT_942 = NL + "\t\t\t\tif (eInternalContainer() != null)" + NL + "\t\t\t\t\tchangeContext = eBasicRemoveFromContainer(changeContext);" + NL + "\t\t\t\treturn eBasicSetContainer(otherEnd, ";
+  protected final String TEXT_943 = ", changeContext);";
+  protected final String TEXT_944 = NL + "\t\t\t\t";
+  protected final String TEXT_945 = " ";
+  protected final String TEXT_946 = " = (";
+  protected final String TEXT_947 = ")eVirtualGet(";
+  protected final String TEXT_948 = ");";
+  protected final String TEXT_949 = NL + "\t\t\t\tif (";
+  protected final String TEXT_950 = " != null)";
+  protected final String TEXT_951 = NL + "\t\t\t\t\tchangeContext = ((";
+  protected final String TEXT_952 = ")";
+  protected final String TEXT_953 = ").inverseRemove(this, EOPPOSITE_FEATURE_BASE - ";
+  protected final String TEXT_954 = ", null, changeContext);";
+  protected final String TEXT_955 = NL + "\t\t\t\t\tchangeContext = ((";
+  protected final String TEXT_956 = ")";
+  protected final String TEXT_957 = ").inverseRemove(this, ";
+  protected final String TEXT_958 = ", ";
+  protected final String TEXT_959 = ".class, changeContext);";
+  protected final String TEXT_960 = NL + "\t\t\t\treturn basicSet";
+  protected final String TEXT_961 = "((";
+  protected final String TEXT_962 = ")otherEnd, changeContext);";
+  protected final String TEXT_963 = NL + "\t\t}";
+  protected final String TEXT_964 = NL + "\t\treturn super.eInverseAdd(otherEnd, propertyIndex, changeContext);";
+  protected final String TEXT_965 = NL + "\t\treturn eDynamicInverseAdd(otherEnd, propertyIndex, changeContext);";
+  protected final String TEXT_966 = NL + "\t}" + NL;
+  protected final String TEXT_967 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ChangeContext inverseRemove(";
+  protected final String TEXT_968 = " otherEnd, int propertyIndex, ChangeContext changeContext)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
+  protected final String TEXT_969 = NL + "\t\t\tcase ";
+  protected final String TEXT_970 = ":";
+  protected final String TEXT_971 = NL + "\t\t\t\treturn ((";
+  protected final String TEXT_972 = ")((";
+  protected final String TEXT_973 = ".InternalMapView)";
+  protected final String TEXT_974 = "()).eMap()).basicRemove(otherEnd, changeContext);";
+  protected final String TEXT_975 = NL + "\t\t\t\treturn removeFrom";
+  protected final String TEXT_976 = "(";
   protected final String TEXT_977 = "(), otherEnd, changeContext);";
-  protected final String TEXT_978 = NL + "\t\t\t\treturn eBasicSetContainer(null, ";
-  protected final String TEXT_979 = ", changeContext);";
-  protected final String TEXT_980 = NL + "\t\t\t\treturn basicUnset";
-  protected final String TEXT_981 = "(changeContext);";
-  protected final String TEXT_982 = NL + "\t\t\t\treturn basicSet";
-  protected final String TEXT_983 = "(null, changeContext);";
-  protected final String TEXT_984 = NL + "\t\t}";
-  protected final String TEXT_985 = NL + "\t\treturn super.inverseRemove(otherEnd, propertyIndex, changeContext);";
-  protected final String TEXT_986 = NL + "\t\treturn eDynamicInverseRemove(otherEnd, propertyIndex, changeContext);";
-  protected final String TEXT_987 = NL + "\t}" + NL;
-  protected final String TEXT_988 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ChangeContext eBasicRemoveFromContainerFeature(ChangeContext changeContext)" + NL + "\t{" + NL + "\t\tswitch (eContainerFeatureID)" + NL + "\t\t{";
-  protected final String TEXT_989 = NL + "\t\t\tcase ";
-  protected final String TEXT_990 = ":" + NL + "\t\t\t\treturn eInternalContainer().inverseRemove(this, ";
-  protected final String TEXT_991 = ", ";
-  protected final String TEXT_992 = ".class, changeContext);";
-  protected final String TEXT_993 = NL + "\t\t}";
-  protected final String TEXT_994 = NL + "\t\treturn super.eBasicRemoveFromContainerFeature(changeContext);";
-  protected final String TEXT_995 = NL + "\t\treturn eDynamicBasicRemoveFromContainer(changeContext);";
-  protected final String TEXT_996 = NL + "\t}" + NL;
-  protected final String TEXT_997 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object get(int propertyIndex, boolean resolve)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
-  protected final String TEXT_998 = NL + "\t\t\tcase ";
-  protected final String TEXT_999 = ":";
-  protected final String TEXT_1000 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1001 = "() ? Boolean.TRUE : Boolean.FALSE;";
-  protected final String TEXT_1002 = NL + "\t\t\t\treturn new ";
-  protected final String TEXT_1003 = "(";
-  protected final String TEXT_1004 = "());";
-  protected final String TEXT_1005 = NL + "\t\t\t\tif (resolve) return ";
-  protected final String TEXT_1006 = "();" + NL + "\t\t\t\treturn basicGet";
-  protected final String TEXT_1007 = "();";
-  protected final String TEXT_1008 = NL + "\t\t\t\tif (coreType) return ((";
-  protected final String TEXT_1009 = ".InternalMapView)";
-  protected final String TEXT_1010 = "()).eMap();" + NL + "\t\t\t\telse return ";
-  protected final String TEXT_1011 = "();";
-  protected final String TEXT_1012 = NL + "\t\t\t\tif (coreType) return ";
-  protected final String TEXT_1013 = "();" + NL + "\t\t\t\telse return ";
-  protected final String TEXT_1014 = "().map();";
-  protected final String TEXT_1015 = NL + "\t\t\t\t// XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view" + NL + "\t\t\t\t//if (coreType) " + NL + "\t\t\t\treturn ";
-  protected final String TEXT_1016 = "();";
-  protected final String TEXT_1017 = NL + "\t\t\t\tif (coreType) return ";
-  protected final String TEXT_1018 = "();" + NL + "\t\t\t\treturn ((";
-  protected final String TEXT_1019 = ".Internal)";
-  protected final String TEXT_1020 = "()).getWrapper();";
-  protected final String TEXT_1021 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1022 = "();";
-  protected final String TEXT_1023 = NL + "\t\t}";
-  protected final String TEXT_1024 = NL + "\t\treturn super.get(propertyIndex, resolve);";
-  protected final String TEXT_1025 = NL + "\t\treturn eDynamicGet(propertyIndex, resolve, coreType);";
-  protected final String TEXT_1026 = NL + "\t}" + NL;
-  protected final String TEXT_1027 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void set(int propertyIndex, Object newValue)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
-  protected final String TEXT_1028 = NL + "\t\t\tcase ";
-  protected final String TEXT_1029 = ":";
-  protected final String TEXT_1030 = NL + "      \tset";
-  protected final String TEXT_1031 = "(";
-  protected final String TEXT_1032 = "(), newValue);";
-  protected final String TEXT_1033 = NL + "\t\t\t\t((";
-  protected final String TEXT_1034 = ".Internal)";
-  protected final String TEXT_1035 = "()).set(newValue);";
-  protected final String TEXT_1036 = NL + "\t\t\t\t((";
-  protected final String TEXT_1037 = ".Setting)((";
-  protected final String TEXT_1038 = ".InternalMapView)";
-  protected final String TEXT_1039 = "()).eMap()).set(newValue);";
-  protected final String TEXT_1040 = NL + "\t\t\t\t((";
-  protected final String TEXT_1041 = ".Setting)";
-  protected final String TEXT_1042 = "()).set(newValue);";
-  protected final String TEXT_1043 = NL + "\t\t\t\t";
-  protected final String TEXT_1044 = "().clear();" + NL + "\t\t\t\t";
-  protected final String TEXT_1045 = "().addAll((";
-  protected final String TEXT_1046 = ")newValue);";
-  protected final String TEXT_1047 = NL + "\t\t\t\tset";
-  protected final String TEXT_1048 = "(((";
-  protected final String TEXT_1049 = ")newValue).";
-  protected final String TEXT_1050 = "());";
-  protected final String TEXT_1051 = NL + "\t\t\t\tset";
-  protected final String TEXT_1052 = "((";
-  protected final String TEXT_1053 = ")newValue);";
-  protected final String TEXT_1054 = NL + "\t\t\t\treturn;";
-  protected final String TEXT_1055 = NL + "\t\t}";
-  protected final String TEXT_1056 = NL + "\t\tsuper.set(propertyIndex, newValue);";
-  protected final String TEXT_1057 = NL + "\t\teDynamicSet(propertyIndex, newValue);";
-  protected final String TEXT_1058 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void unset(int propertyIndex)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
-  protected final String TEXT_1059 = NL + "\t\t\tcase ";
-  protected final String TEXT_1060 = ":";
-  protected final String TEXT_1061 = NL + "\t\t\t\tunset";
-  protected final String TEXT_1062 = "(";
-  protected final String TEXT_1063 = "());";
-  protected final String TEXT_1064 = NL + "\t\t\t\t";
-  protected final String TEXT_1065 = "().clear();";
-  protected final String TEXT_1066 = NL + "\t\t\t\tunset";
-  protected final String TEXT_1067 = "();";
-  protected final String TEXT_1068 = NL + "\t\t\t\tset";
-  protected final String TEXT_1069 = "((";
-  protected final String TEXT_1070 = ")null);";
-  protected final String TEXT_1071 = NL + "\t\t\t\tset";
-  protected final String TEXT_1072 = "(";
-  protected final String TEXT_1073 = "_DEFAULT_);";
-  protected final String TEXT_1074 = NL + "\t\t\t\treturn;";
-  protected final String TEXT_1075 = NL + "\t\t}";
-  protected final String TEXT_1076 = NL + "\t\tsuper.unset(propertyIndex);";
-  protected final String TEXT_1077 = NL + "\t\teDynamicUnset(propertyIndex);";
-  protected final String TEXT_1078 = NL + "\t}" + NL;
-  protected final String TEXT_1079 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic boolean isSet(int propertyIndex)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
-  protected final String TEXT_1080 = NL + "\t\t\tcase ";
-  protected final String TEXT_1081 = ":";
-  protected final String TEXT_1082 = NL + "\t\t\t\treturn !is";
-  protected final String TEXT_1083 = "Empty(";
-  protected final String TEXT_1084 = "());";
-  protected final String TEXT_1085 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1086 = " != null && !is";
-  protected final String TEXT_1087 = "Empty(";
-  protected final String TEXT_1088 = "());";
-  protected final String TEXT_1089 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1090 = " != null && !";
-  protected final String TEXT_1091 = ".isEmpty();";
-  protected final String TEXT_1092 = NL + "\t\t\t\t";
-  protected final String TEXT_1093 = " ";
-  protected final String TEXT_1094 = " = (";
-  protected final String TEXT_1095 = ")eVirtualGet(";
-  protected final String TEXT_1096 = ");" + NL + "\t\t\t\treturn ";
-  protected final String TEXT_1097 = " != null && !";
-  protected final String TEXT_1098 = ".isEmpty();";
-  protected final String TEXT_1099 = NL + "\t\t\t\treturn !";
-  protected final String TEXT_1100 = "().isEmpty();";
-  protected final String TEXT_1101 = NL + "\t\t\t\treturn isSet";
-  protected final String TEXT_1102 = "();";
-  protected final String TEXT_1103 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1104 = " != null;";
-  protected final String TEXT_1105 = NL + "\t\t\t\treturn eVirtualGet(";
-  protected final String TEXT_1106 = ") != null;";
-  protected final String TEXT_1107 = NL + "\t\t\t\treturn basicGet";
-  protected final String TEXT_1108 = "() != null;";
-  protected final String TEXT_1109 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1110 = " != null;";
-  protected final String TEXT_1111 = NL + "\t\t\t\treturn eVirtualGet(";
-  protected final String TEXT_1112 = ") != null;";
-  protected final String TEXT_1113 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1114 = "() != null;";
-  protected final String TEXT_1115 = NL + "\t\t\t\treturn ((";
-  protected final String TEXT_1116 = " & ";
-  protected final String TEXT_1117 = "_EFLAG) != 0) != ";
-  protected final String TEXT_1118 = "_DEFAULT_;";
-  protected final String TEXT_1119 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1120 = " != ";
-  protected final String TEXT_1121 = "_DEFAULT_;";
-  protected final String TEXT_1122 = NL + "\t\t\t\treturn eVirtualGet(";
-  protected final String TEXT_1123 = ", ";
-  protected final String TEXT_1124 = "_DEFAULT_) != ";
-  protected final String TEXT_1125 = "_DEFAULT_;";
-  protected final String TEXT_1126 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1127 = "() != ";
-  protected final String TEXT_1128 = "_DEFAULT_;";
-  protected final String TEXT_1129 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1130 = "_DEFAULT_ == null ? ";
-  protected final String TEXT_1131 = " != null : !";
-  protected final String TEXT_1132 = "_DEFAULT_.equals(";
-  protected final String TEXT_1133 = ");";
-  protected final String TEXT_1134 = NL + "\t\t\t\t";
-  protected final String TEXT_1135 = " ";
-  protected final String TEXT_1136 = " = (";
-  protected final String TEXT_1137 = ")eVirtualGet(";
-  protected final String TEXT_1138 = ", ";
-  protected final String TEXT_1139 = "_DEFAULT_);" + NL + "\t\t\t\treturn ";
-  protected final String TEXT_1140 = "_DEFAULT_ == null ? ";
-  protected final String TEXT_1141 = " != null : !";
-  protected final String TEXT_1142 = "_DEFAULT_.equals(";
-  protected final String TEXT_1143 = ");";
-  protected final String TEXT_1144 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1145 = "_DEFAULT_ == null ? ";
-  protected final String TEXT_1146 = "() != null : !";
-  protected final String TEXT_1147 = "_DEFAULT_.equals(";
-  protected final String TEXT_1148 = "());";
-  protected final String TEXT_1149 = NL + "\t\t}";
-  protected final String TEXT_1150 = NL + "\t\treturn super.isSet(propertyIndex);";
-  protected final String TEXT_1151 = NL + "\t\treturn eDynamicIsSet(propertyIndex);";
-  protected final String TEXT_1152 = NL + "\t}" + NL;
-  protected final String TEXT_1153 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)" + NL + "\t{";
-  protected final String TEXT_1154 = NL + "\t\tif (baseClass == ";
-  protected final String TEXT_1155 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (derivedFeatureID)" + NL + "\t\t\t{";
-  protected final String TEXT_1156 = NL + "\t\t\t\tcase ";
-  protected final String TEXT_1157 = ": return ";
-  protected final String TEXT_1158 = ";";
-  protected final String TEXT_1159 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
-  protected final String TEXT_1160 = NL + "\t\treturn super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)" + NL + "\t{";
-  protected final String TEXT_1161 = NL + "\t\tif (baseClass == ";
-  protected final String TEXT_1162 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseFeatureID)" + NL + "\t\t\t{";
-  protected final String TEXT_1163 = NL + "\t\t\t\tcase ";
-  protected final String TEXT_1164 = ": return ";
-  protected final String TEXT_1165 = ";";
-  protected final String TEXT_1166 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
-  protected final String TEXT_1167 = NL + "\t\treturn super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);" + NL + "\t}" + NL;
-  protected final String TEXT_1168 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Object[] eVirtualValues()" + NL + "\t{" + NL + "\t\treturn ";
-  protected final String TEXT_1169 = ";" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setVirtualValues(Object[] newValues)" + NL + "\t{" + NL + "\t\t";
-  protected final String TEXT_1170 = " = newValues;" + NL + "\t}" + NL;
-  protected final String TEXT_1171 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected int eVirtualIndexBits(int offset)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
-  protected final String TEXT_1172 = NL + "\t\t\tcase ";
-  protected final String TEXT_1173 = " :" + NL + "\t\t\t\treturn ";
-  protected final String TEXT_1174 = ";";
-  protected final String TEXT_1175 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setVirtualIndexBits(int offset, int newIndexBits)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
-  protected final String TEXT_1176 = NL + "\t\t\tcase ";
-  protected final String TEXT_1177 = " :" + NL + "\t\t\t\t";
-  protected final String TEXT_1178 = " = newIndexBits;" + NL + "\t\t\t\tbreak;";
-  protected final String TEXT_1179 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL;
-  protected final String TEXT_1180 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String toString()" + NL + "\t{" + NL + "\t\tif (isProxy(this)) return super.toString();" + NL + "" + NL + "\t\tStringBuffer result = new StringBuffer(super.toString());";
-  protected final String TEXT_1181 = NL + "\t\tresult.append(\" (";
-  protected final String TEXT_1182 = ": \");";
-  protected final String TEXT_1183 = NL + "\t\tresult.append(\", ";
+  protected final String TEXT_978 = NL + "\t\t\t\treturn removeFromList(";
+  protected final String TEXT_979 = "(), otherEnd, changeContext);";
+  protected final String TEXT_980 = NL + "\t\t\t\treturn eBasicSetContainer(null, ";
+  protected final String TEXT_981 = ", changeContext);";
+  protected final String TEXT_982 = NL + "\t\t\t\treturn basicUnset";
+  protected final String TEXT_983 = "(changeContext);";
+  protected final String TEXT_984 = NL + "\t\t\t\treturn basicSet";
+  protected final String TEXT_985 = "(null, changeContext);";
+  protected final String TEXT_986 = NL + "\t\t}";
+  protected final String TEXT_987 = NL + "\t\treturn super.inverseRemove(otherEnd, propertyIndex, changeContext);";
+  protected final String TEXT_988 = NL + "\t\treturn eDynamicInverseRemove(otherEnd, propertyIndex, changeContext);";
+  protected final String TEXT_989 = NL + "\t}" + NL;
+  protected final String TEXT_990 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ChangeContext eBasicRemoveFromContainerFeature(ChangeContext changeContext)" + NL + "\t{" + NL + "\t\tswitch (eContainerFeatureID)" + NL + "\t\t{";
+  protected final String TEXT_991 = NL + "\t\t\tcase ";
+  protected final String TEXT_992 = ":" + NL + "\t\t\t\treturn eInternalContainer().inverseRemove(this, ";
+  protected final String TEXT_993 = ", ";
+  protected final String TEXT_994 = ".class, changeContext);";
+  protected final String TEXT_995 = NL + "\t\t}";
+  protected final String TEXT_996 = NL + "\t\treturn super.eBasicRemoveFromContainerFeature(changeContext);";
+  protected final String TEXT_997 = NL + "\t\treturn eDynamicBasicRemoveFromContainer(changeContext);";
+  protected final String TEXT_998 = NL + "\t}" + NL;
+  protected final String TEXT_999 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object get(int propertyIndex, boolean resolve)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
+  protected final String TEXT_1000 = NL + "\t\t\tcase ";
+  protected final String TEXT_1001 = ":";
+  protected final String TEXT_1002 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1003 = "() ? Boolean.TRUE : Boolean.FALSE;";
+  protected final String TEXT_1004 = NL + "\t\t\t\treturn new ";
+  protected final String TEXT_1005 = "(";
+  protected final String TEXT_1006 = "());";
+  protected final String TEXT_1007 = NL + "\t\t\t\tif (resolve) return ";
+  protected final String TEXT_1008 = "();" + NL + "\t\t\t\treturn basicGet";
+  protected final String TEXT_1009 = "();";
+  protected final String TEXT_1010 = NL + "\t\t\t\tif (coreType) return ((";
+  protected final String TEXT_1011 = ".InternalMapView)";
+  protected final String TEXT_1012 = "()).eMap();" + NL + "\t\t\t\telse return ";
+  protected final String TEXT_1013 = "();";
+  protected final String TEXT_1014 = NL + "\t\t\t\tif (coreType) return ";
+  protected final String TEXT_1015 = "();" + NL + "\t\t\t\telse return ";
+  protected final String TEXT_1016 = "().map();";
+  protected final String TEXT_1017 = NL + "\t\t\t\t// XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view" + NL + "\t\t\t\t//if (coreType) " + NL + "\t\t\t\treturn ";
+  protected final String TEXT_1018 = "();";
+  protected final String TEXT_1019 = NL + "\t\t\t\tif (coreType) return ";
+  protected final String TEXT_1020 = "();" + NL + "\t\t\t\treturn ((";
+  protected final String TEXT_1021 = ".Internal)";
+  protected final String TEXT_1022 = "()).getWrapper();";
+  protected final String TEXT_1023 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1024 = "();";
+  protected final String TEXT_1025 = NL + "\t\t}";
+  protected final String TEXT_1026 = NL + "\t\treturn super.get(propertyIndex, resolve);";
+  protected final String TEXT_1027 = NL + "\t\treturn eDynamicGet(propertyIndex, resolve, coreType);";
+  protected final String TEXT_1028 = NL + "\t}" + NL;
+  protected final String TEXT_1029 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void set(int propertyIndex, Object newValue)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
+  protected final String TEXT_1030 = NL + "\t\t\tcase ";
+  protected final String TEXT_1031 = ":";
+  protected final String TEXT_1032 = NL + "      \tset";
+  protected final String TEXT_1033 = "(";
+  protected final String TEXT_1034 = "(), newValue);";
+  protected final String TEXT_1035 = NL + "\t\t\t\t((";
+  protected final String TEXT_1036 = ".Internal)";
+  protected final String TEXT_1037 = "()).set(newValue);";
+  protected final String TEXT_1038 = NL + "\t\t\t\t((";
+  protected final String TEXT_1039 = ".Setting)((";
+  protected final String TEXT_1040 = ".InternalMapView)";
+  protected final String TEXT_1041 = "()).eMap()).set(newValue);";
+  protected final String TEXT_1042 = NL + "\t\t\t\t((";
+  protected final String TEXT_1043 = ".Setting)";
+  protected final String TEXT_1044 = "()).set(newValue);";
+  protected final String TEXT_1045 = NL + "\t\t\t\t";
+  protected final String TEXT_1046 = "().clear();" + NL + "\t\t\t\t";
+  protected final String TEXT_1047 = "().addAll((";
+  protected final String TEXT_1048 = ")newValue);";
+  protected final String TEXT_1049 = NL + "\t\t\t\tset";
+  protected final String TEXT_1050 = "(((";
+  protected final String TEXT_1051 = ")newValue).";
+  protected final String TEXT_1052 = "());";
+  protected final String TEXT_1053 = NL + "\t\t\t\tset";
+  protected final String TEXT_1054 = "((";
+  protected final String TEXT_1055 = ")newValue);";
+  protected final String TEXT_1056 = NL + "\t\t\t\treturn;";
+  protected final String TEXT_1057 = NL + "\t\t}";
+  protected final String TEXT_1058 = NL + "\t\tsuper.set(propertyIndex, newValue);";
+  protected final String TEXT_1059 = NL + "\t\teDynamicSet(propertyIndex, newValue);";
+  protected final String TEXT_1060 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void unset(int propertyIndex)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
+  protected final String TEXT_1061 = NL + "\t\t\tcase ";
+  protected final String TEXT_1062 = ":";
+  protected final String TEXT_1063 = NL + "\t\t\t\tunset";
+  protected final String TEXT_1064 = "(";
+  protected final String TEXT_1065 = "());";
+  protected final String TEXT_1066 = NL + "\t\t\t\t";
+  protected final String TEXT_1067 = "().clear();";
+  protected final String TEXT_1068 = NL + "\t\t\t\tunset";
+  protected final String TEXT_1069 = "();";
+  protected final String TEXT_1070 = NL + "\t\t\t\tset";
+  protected final String TEXT_1071 = "((";
+  protected final String TEXT_1072 = ")null);";
+  protected final String TEXT_1073 = NL + "\t\t\t\tset";
+  protected final String TEXT_1074 = "(";
+  protected final String TEXT_1075 = "_DEFAULT_);";
+  protected final String TEXT_1076 = NL + "\t\t\t\treturn;";
+  protected final String TEXT_1077 = NL + "\t\t}";
+  protected final String TEXT_1078 = NL + "\t\tsuper.unset(propertyIndex);";
+  protected final String TEXT_1079 = NL + "\t\teDynamicUnset(propertyIndex);";
+  protected final String TEXT_1080 = NL + "\t}" + NL;
+  protected final String TEXT_1081 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic boolean isSet(int propertyIndex)" + NL + "\t{" + NL + "\t\tswitch (propertyIndex)" + NL + "\t\t{";
+  protected final String TEXT_1082 = NL + "\t\t\tcase ";
+  protected final String TEXT_1083 = ":";
+  protected final String TEXT_1084 = NL + "\t\t\t\treturn !is";
+  protected final String TEXT_1085 = "Empty(";
+  protected final String TEXT_1086 = "());";
+  protected final String TEXT_1087 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1088 = " != null && !is";
+  protected final String TEXT_1089 = "Empty(";
+  protected final String TEXT_1090 = "());";
+  protected final String TEXT_1091 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1092 = " != null && !";
+  protected final String TEXT_1093 = ".isEmpty();";
+  protected final String TEXT_1094 = NL + "\t\t\t\t";
+  protected final String TEXT_1095 = " ";
+  protected final String TEXT_1096 = " = (";
+  protected final String TEXT_1097 = ")eVirtualGet(";
+  protected final String TEXT_1098 = ");" + NL + "\t\t\t\treturn ";
+  protected final String TEXT_1099 = " != null && !";
+  protected final String TEXT_1100 = ".isEmpty();";
+  protected final String TEXT_1101 = NL + "\t\t\t\treturn !";
+  protected final String TEXT_1102 = "().isEmpty();";
+  protected final String TEXT_1103 = NL + "\t\t\t\treturn isSet";
+  protected final String TEXT_1104 = "();";
+  protected final String TEXT_1105 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1106 = " != null;";
+  protected final String TEXT_1107 = NL + "\t\t\t\treturn eVirtualGet(";
+  protected final String TEXT_1108 = ") != null;";
+  protected final String TEXT_1109 = NL + "\t\t\t\treturn basicGet";
+  protected final String TEXT_1110 = "() != null;";
+  protected final String TEXT_1111 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1112 = " != null;";
+  protected final String TEXT_1113 = NL + "\t\t\t\treturn eVirtualGet(";
+  protected final String TEXT_1114 = ") != null;";
+  protected final String TEXT_1115 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1116 = "() != null;";
+  protected final String TEXT_1117 = NL + "\t\t\t\treturn ((";
+  protected final String TEXT_1118 = " & ";
+  protected final String TEXT_1119 = "_EFLAG) != 0) != ";
+  protected final String TEXT_1120 = "_DEFAULT_;";
+  protected final String TEXT_1121 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1122 = " != ";
+  protected final String TEXT_1123 = "_DEFAULT_;";
+  protected final String TEXT_1124 = NL + "\t\t\t\treturn eVirtualGet(";
+  protected final String TEXT_1125 = ", ";
+  protected final String TEXT_1126 = "_DEFAULT_) != ";
+  protected final String TEXT_1127 = "_DEFAULT_;";
+  protected final String TEXT_1128 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1129 = "() != ";
+  protected final String TEXT_1130 = "_DEFAULT_;";
+  protected final String TEXT_1131 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1132 = "_DEFAULT_ == null ? ";
+  protected final String TEXT_1133 = " != null : !";
+  protected final String TEXT_1134 = "_DEFAULT_.equals(";
+  protected final String TEXT_1135 = ");";
+  protected final String TEXT_1136 = NL + "\t\t\t\t";
+  protected final String TEXT_1137 = " ";
+  protected final String TEXT_1138 = " = (";
+  protected final String TEXT_1139 = ")eVirtualGet(";
+  protected final String TEXT_1140 = ", ";
+  protected final String TEXT_1141 = "_DEFAULT_);" + NL + "\t\t\t\treturn ";
+  protected final String TEXT_1142 = "_DEFAULT_ == null ? ";
+  protected final String TEXT_1143 = " != null : !";
+  protected final String TEXT_1144 = "_DEFAULT_.equals(";
+  protected final String TEXT_1145 = ");";
+  protected final String TEXT_1146 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1147 = "_DEFAULT_ == null ? ";
+  protected final String TEXT_1148 = "() != null : !";
+  protected final String TEXT_1149 = "_DEFAULT_.equals(";
+  protected final String TEXT_1150 = "());";
+  protected final String TEXT_1151 = NL + "\t\t}";
+  protected final String TEXT_1152 = NL + "\t\treturn super.isSet(propertyIndex);";
+  protected final String TEXT_1153 = NL + "\t\treturn eDynamicIsSet(propertyIndex);";
+  protected final String TEXT_1154 = NL + "\t}" + NL;
+  protected final String TEXT_1155 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)" + NL + "\t{";
+  protected final String TEXT_1156 = NL + "\t\tif (baseClass == ";
+  protected final String TEXT_1157 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (derivedFeatureID)" + NL + "\t\t\t{";
+  protected final String TEXT_1158 = NL + "\t\t\t\tcase ";
+  protected final String TEXT_1159 = ": return ";
+  protected final String TEXT_1160 = ";";
+  protected final String TEXT_1161 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
+  protected final String TEXT_1162 = NL + "\t\treturn super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)" + NL + "\t{";
+  protected final String TEXT_1163 = NL + "\t\tif (baseClass == ";
+  protected final String TEXT_1164 = ".class)" + NL + "\t\t{" + NL + "\t\t\tswitch (baseFeatureID)" + NL + "\t\t\t{";
+  protected final String TEXT_1165 = NL + "\t\t\t\tcase ";
+  protected final String TEXT_1166 = ": return ";
+  protected final String TEXT_1167 = ";";
+  protected final String TEXT_1168 = NL + "\t\t\t\tdefault: return -1;" + NL + "\t\t\t}" + NL + "\t\t}";
+  protected final String TEXT_1169 = NL + "\t\treturn super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);" + NL + "\t}" + NL;
+  protected final String TEXT_1170 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Object[] eVirtualValues()" + NL + "\t{" + NL + "\t\treturn ";
+  protected final String TEXT_1171 = ";" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setVirtualValues(Object[] newValues)" + NL + "\t{" + NL + "\t\t";
+  protected final String TEXT_1172 = " = newValues;" + NL + "\t}" + NL;
+  protected final String TEXT_1173 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected int eVirtualIndexBits(int offset)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
+  protected final String TEXT_1174 = NL + "\t\t\tcase ";
+  protected final String TEXT_1175 = " :" + NL + "\t\t\t\treturn ";
+  protected final String TEXT_1176 = ";";
+  protected final String TEXT_1177 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setVirtualIndexBits(int offset, int newIndexBits)" + NL + "\t{" + NL + "\t\tswitch (offset)" + NL + "\t\t{";
+  protected final String TEXT_1178 = NL + "\t\t\tcase ";
+  protected final String TEXT_1179 = " :" + NL + "\t\t\t\t";
+  protected final String TEXT_1180 = " = newIndexBits;" + NL + "\t\t\t\tbreak;";
+  protected final String TEXT_1181 = NL + "\t\t\tdefault :" + NL + "\t\t\t\tthrow new IndexOutOfBoundsException();" + NL + "\t\t}" + NL + "\t}" + NL;
+  protected final String TEXT_1182 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String toString()" + NL + "\t{" + NL + "\t\tif (isProxy(this)) return super.toString();" + NL + "" + NL + "\t\tStringBuffer result = new StringBuffer(super.toString());";
+  protected final String TEXT_1183 = NL + "\t\tresult.append(\" (";
   protected final String TEXT_1184 = ": \");";
-  protected final String TEXT_1185 = NL + "\t\tif (eVirtualIsSet(";
-  protected final String TEXT_1186 = ")) result.append(eVirtualGet(";
-  protected final String TEXT_1187 = ")); else result.append(\"<unset>\");";
-  protected final String TEXT_1188 = NL + "\t\tif (";
-  protected final String TEXT_1189 = "(";
-  protected final String TEXT_1190 = " & ";
-  protected final String TEXT_1191 = "_ESETFLAG) != 0";
-  protected final String TEXT_1192 = "_set_";
-  protected final String TEXT_1193 = ") result.append((";
-  protected final String TEXT_1194 = " & ";
-  protected final String TEXT_1195 = "_EFLAG) != 0); else result.append(\"<unset>\");";
-  protected final String TEXT_1196 = NL + "\t\tif (";
-  protected final String TEXT_1197 = "(";
-  protected final String TEXT_1198 = " & ";
-  protected final String TEXT_1199 = "_ESETFLAG) != 0";
-  protected final String TEXT_1200 = "_set_";
-  protected final String TEXT_1201 = ") result.append(";
-  protected final String TEXT_1202 = "); else result.append(\"<unset>\");";
-  protected final String TEXT_1203 = NL + "\t\tresult.append(eVirtualGet(";
-  protected final String TEXT_1204 = ", ";
-  protected final String TEXT_1205 = "_DEFAULT_";
-  protected final String TEXT_1206 = "));";
-  protected final String TEXT_1207 = NL + "\t\tresult.append((";
-  protected final String TEXT_1208 = " & ";
-  protected final String TEXT_1209 = "_EFLAG) != 0);";
-  protected final String TEXT_1210 = NL + "\t\tresult.append(";
-  protected final String TEXT_1211 = ");";
-  protected final String TEXT_1212 = NL + "\t\tresult.append(')');" + NL + "\t\treturn result.toString();" + NL + "\t}" + NL;
-  protected final String TEXT_1213 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected int hash = -1;" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + " \t * @generated" + NL + " \t */" + NL + "\tpublic int getHash()" + NL + "\t{" + NL + "\t\tif (hash == -1)" + NL + "\t\t{" + NL + "\t\t\tObject theKey = getKey();" + NL + "\t\t\thash = (theKey == null ? 0 : theKey.hashCode());" + NL + "\t\t}" + NL + "\t\treturn hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * <!-- begin-user-doc -->" + NL + " \t * <!-- end-user-doc -->" + NL + " \t * @generated" + NL + " \t */" + NL + "\tpublic void setHash(int hash)" + NL + "\t{" + NL + "\t\tthis.hash = hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * <!-- begin-user-doc -->" + NL + " \t * <!-- end-user-doc -->" + NL + " \t * @generated" + NL + " \t */" + NL + "\tpublic
  Object getKey()" + NL + "\t{" + NL + "  \t";
-  protected final String TEXT_1214 = NL + "\t\treturn new ";
-  protected final String TEXT_1215 = "(getTypedKey());" + NL + " \t";
-  protected final String TEXT_1216 = NL + "\t\treturn getTypedKey();" + NL + "  \t";
-  protected final String TEXT_1217 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setKey(Object key)" + NL + "\t{";
-  protected final String TEXT_1218 = NL + "\t\tgetTypedKey().addAll((";
-  protected final String TEXT_1219 = ")key);";
-  protected final String TEXT_1220 = NL + "\t\tsetTypedKey(((";
-  protected final String TEXT_1221 = ")key).";
-  protected final String TEXT_1222 = "());";
-  protected final String TEXT_1223 = NL + "\t\tsetTypedKey((";
-  protected final String TEXT_1224 = ")key);";
-  protected final String TEXT_1225 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getValue()" + NL + "\t{" + NL + " \t";
-  protected final String TEXT_1226 = NL + "\t\treturn new ";
-  protected final String TEXT_1227 = "(getTypedValue());" + NL + " \t";
-  protected final String TEXT_1228 = NL + "\t\treturn getTypedValue();" + NL + " \t";
-  protected final String TEXT_1229 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object setValue(Object value)" + NL + "\t{" + NL + "\t\tObject oldValue = getValue();" + NL + "  \t";
-  protected final String TEXT_1230 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll((";
-  protected final String TEXT_1231 = ")value);" + NL + "  \t";
-  protected final String TEXT_1232 = NL + "\t\tsetTypedValue(((";
-  protected final String TEXT_1233 = ")value).";
-  protected final String TEXT_1234 = "());" + NL + "  \t";
-  protected final String TEXT_1235 = NL + "\t\tsetTypedValue((";
-  protected final String TEXT_1236 = ")value);" + NL + "  \t";
-  protected final String TEXT_1237 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_1238 = " getEMap()" + NL + "\t{" + NL + "\t\t";
-  protected final String TEXT_1239 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";
-  protected final String TEXT_1240 = ")container.get(eContainmentFeature());" + NL + "\t}";
-  protected final String TEXT_1241 = NL + "} //";
-  protected final String TEXT_1242 = NL;
+  protected final String TEXT_1185 = NL + "\t\tresult.append(\", ";
+  protected final String TEXT_1186 = ": \");";
+  protected final String TEXT_1187 = NL + "\t\tif (eVirtualIsSet(";
+  protected final String TEXT_1188 = ")) result.append(eVirtualGet(";
+  protected final String TEXT_1189 = ")); else result.append(\"<unset>\");";
+  protected final String TEXT_1190 = NL + "\t\tif (";
+  protected final String TEXT_1191 = "(";
+  protected final String TEXT_1192 = " & ";
+  protected final String TEXT_1193 = "_ESETFLAG) != 0";
+  protected final String TEXT_1194 = "_set_";
+  protected final String TEXT_1195 = ") result.append((";
+  protected final String TEXT_1196 = " & ";
+  protected final String TEXT_1197 = "_EFLAG) != 0); else result.append(\"<unset>\");";
+  protected final String TEXT_1198 = NL + "\t\tif (";
+  protected final String TEXT_1199 = "(";
+  protected final String TEXT_1200 = " & ";
+  protected final String TEXT_1201 = "_ESETFLAG) != 0";
+  protected final String TEXT_1202 = "_set_";
+  protected final String TEXT_1203 = ") result.append(";
+  protected final String TEXT_1204 = "); else result.append(\"<unset>\");";
+  protected final String TEXT_1205 = NL + "\t\tresult.append(eVirtualGet(";
+  protected final String TEXT_1206 = ", ";
+  protected final String TEXT_1207 = "_DEFAULT_";
+  protected final String TEXT_1208 = "));";
+  protected final String TEXT_1209 = NL + "\t\tresult.append((";
+  protected final String TEXT_1210 = " & ";
+  protected final String TEXT_1211 = "_EFLAG) != 0);";
+  protected final String TEXT_1212 = NL + "\t\tresult.append(";
+  protected final String TEXT_1213 = ");";
+  protected final String TEXT_1214 = NL + "\t\tresult.append(')');" + NL + "\t\treturn result.toString();" + NL + "\t}" + NL;
+  protected final String TEXT_1215 = NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected int hash = -1;" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + " \t * @generated" + NL + " \t */" + NL + "\tpublic int getHash()" + NL + "\t{" + NL + "\t\tif (hash == -1)" + NL + "\t\t{" + NL + "\t\t\tObject theKey = getKey();" + NL + "\t\t\thash = (theKey == null ? 0 : theKey.hashCode());" + NL + "\t\t}" + NL + "\t\treturn hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * <!-- begin-user-doc -->" + NL + " \t * <!-- end-user-doc -->" + NL + " \t * @generated" + NL + " \t */" + NL + "\tpublic void setHash(int hash)" + NL + "\t{" + NL + "\t\tthis.hash = hash;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * <!-- begin-user-doc -->" + NL + " \t * <!-- end-user-doc -->" + NL + " \t * @generated" + NL + " \t */" + NL + "\tpublic
  Object getKey()" + NL + "\t{" + NL + "  \t";
+  protected final String TEXT_1216 = NL + "\t\treturn new ";
+  protected final String TEXT_1217 = "(getTypedKey());" + NL + " \t";
+  protected final String TEXT_1218 = NL + "\t\treturn getTypedKey();" + NL + "  \t";
+  protected final String TEXT_1219 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setKey(Object key)" + NL + "\t{";
+  protected final String TEXT_1220 = NL + "\t\tgetTypedKey().addAll((";
+  protected final String TEXT_1221 = ")key);";
+  protected final String TEXT_1222 = NL + "\t\tsetTypedKey(((";
+  protected final String TEXT_1223 = ")key).";
+  protected final String TEXT_1224 = "());";
+  protected final String TEXT_1225 = NL + "\t\tsetTypedKey((";
+  protected final String TEXT_1226 = ")key);";
+  protected final String TEXT_1227 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getValue()" + NL + "\t{" + NL + " \t";
+  protected final String TEXT_1228 = NL + "\t\treturn new ";
+  protected final String TEXT_1229 = "(getTypedValue());" + NL + " \t";
+  protected final String TEXT_1230 = NL + "\t\treturn getTypedValue();" + NL + " \t";
+  protected final String TEXT_1231 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object setValue(Object value)" + NL + "\t{" + NL + "\t\tObject oldValue = getValue();" + NL + "  \t";
+  protected final String TEXT_1232 = NL + "\t\tgetTypedValue().clear();" + NL + "\t\tgetTypedValue().addAll((";
+  protected final String TEXT_1233 = ")value);" + NL + "  \t";
+  protected final String TEXT_1234 = NL + "\t\tsetTypedValue(((";
+  protected final String TEXT_1235 = ")value).";
+  protected final String TEXT_1236 = "());" + NL + "  \t";
+  protected final String TEXT_1237 = NL + "\t\tsetTypedValue((";
+  protected final String TEXT_1238 = ")value);" + NL + "  \t";
+  protected final String TEXT_1239 = NL + "\t\treturn oldValue;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * <!-- begin-user-doc -->" + NL + "\t * <!-- end-user-doc -->" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_1240 = " getEMap()" + NL + "\t{" + NL + "\t\t";
+  protected final String TEXT_1241 = " container = eContainer();" + NL + "\t\treturn container == null ? null : (";
+  protected final String TEXT_1242 = ")container.get(eContainmentFeature());" + NL + "\t}";
+  protected final String TEXT_1243 = NL + "} //";
+  protected final String TEXT_1244 = NL;
 
    public String generate(Object argument)
   {
@@ -2898,266 +2900,269 @@
     }
     if (!genModel.isSuppressNotification()) {
     stringBuffer.append(TEXT_695);
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
+    if (genFeature.isUnsettable()) {
     stringBuffer.append(TEXT_696);
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.impl.ENotificationImpl"));
+    stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_697);
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.common.notify.Notification"));
+    if (genModel.isVirtualDelegation()) {
     stringBuffer.append(TEXT_698);
-    stringBuffer.append(genFeature.getUpperName());
+    stringBuffer.append(genFeature.getCapName());
+    } else {
     stringBuffer.append(TEXT_699);
-    if (genModel.isVirtualDelegation()) {
-    stringBuffer.append(TEXT_700);
     stringBuffer.append(genFeature.getCapName());
+    }
+    stringBuffer.append(TEXT_700);
+    if (genModel.isVirtualDelegation()) {
     stringBuffer.append(TEXT_701);
     } else {
     stringBuffer.append(TEXT_702);
     stringBuffer.append(genFeature.getCapName());
-    }
     stringBuffer.append(TEXT_703);
-    if (genModel.isVirtualDelegation()) {
+    }
     stringBuffer.append(TEXT_704);
     } else {
     stringBuffer.append(TEXT_705);
-    stringBuffer.append(genFeature.getCapName());
+    stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_706);
-    }
+    if (genModel.isVirtualDelegation()) {
     stringBuffer.append(TEXT_707);
+    stringBuffer.append(genFeature.getCapName());
+    stringBuffer.append(TEXT_708);
+    stringBuffer.append(genFeature.getCapName());
+    } else {
+    stringBuffer.append(TEXT_709);
+    stringBuffer.append(genFeature.getCapName());
+    }
+    stringBuffer.append(TEXT_710);
+    }
+    stringBuffer.append(TEXT_711);
     }
     } else {
-    stringBuffer.append(TEXT_708);
+    stringBuffer.append(TEXT_712);
     stringBuffer.append(genFeature.getFormattedName());
-    stringBuffer.append(TEXT_709);
+    stringBuffer.append(TEXT_713);
     stringBuffer.append(genFeature.getFeatureKind());
-    stringBuffer.append(TEXT_710);
+    stringBuffer.append(TEXT_714);
     //Class/basicUnsetGenFeature.todo.override.javajetinc
     }
-    stringBuffer.append(TEXT_711);
+    stringBuffer.append(TEXT_715);
     //Class.basicUnsetGenFeature.override.javajetinc
     }
     if (genFeature.isUnset() && (isImplementation || !genFeature.isSuppressedUnsetVisibility())) {
     if (isInterface) {
-    stringBuffer.append(TEXT_712);
+    stringBuffer.append(TEXT_716);
     stringBuffer.append(genClass.getQualifiedInterfaceName());
-    stringBuffer.append(TEXT_713);
+    stringBuffer.append(TEXT_717);
     stringBuffer.append(genFeature.getGetAccessor());
-    stringBuffer.append(TEXT_714);
+    stringBuffer.append(TEXT_718);
     stringBuffer.append(genFeature.getFormattedName());
-    stringBuffer.append(TEXT_715);
+    stringBuffer.append(TEXT_719);
     stringBuffer.append(genFeature.getFeatureKind());
-    stringBuffer.append(TEXT_716);
+    stringBuffer.append(TEXT_720);
     if (!genFeature.isSuppressedIsSetVisibility()) {
-    stringBuffer.append(TEXT_717);
+    stringBuffer.append(TEXT_721);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_718);
+    stringBuffer.append(TEXT_722);
     }
-    stringBuffer.append(TEXT_719);
+    stringBuffer.append(TEXT_723);
     stringBuffer.append(genFeature.getGetAccessor());
-    stringBuffer.append(TEXT_720);
+    stringBuffer.append(TEXT_724);
     if (!genFeature.isListType() && !genFeature.isSuppressedSetVisibility()) {
-    stringBuffer.append(TEXT_721);
+    stringBuffer.append(TEXT_725);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_722);
+    stringBuffer.append(TEXT_726);
     stringBuffer.append(genFeature.getImportedType());
-    stringBuffer.append(TEXT_723);
+    stringBuffer.append(TEXT_727);
     }
-    stringBuffer.append(TEXT_724);
+    stringBuffer.append(TEXT_728);
     } else {
-    stringBuffer.append(TEXT_725);
+    stringBuffer.append(TEXT_729);
     }
     if (!isImplementation) {
-    stringBuffer.append(TEXT_726);
+    stringBuffer.append(TEXT_730);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_727);
+    stringBuffer.append(TEXT_731);
     } else {
-    stringBuffer.append(TEXT_728);
+    stringBuffer.append(TEXT_732);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_729);
+    stringBuffer.append(TEXT_733);
     if (genModel.isReflectiveDelegation()) {
-    stringBuffer.append(TEXT_730);
+    stringBuffer.append(TEXT_734);
     stringBuffer.append(genFeature.getQualifiedFeatureAccessor());
-    stringBuffer.append(TEXT_731);
+    stringBuffer.append(TEXT_735);
     } else if (!genFeature.isVolatile()) {
     if (genFeature.isListType()) {
-    stringBuffer.append(TEXT_732);
+    stringBuffer.append(TEXT_736);
     stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.util.InternalEList"));
-    stringBuffer.append(TEXT_733);
+    stringBuffer.append(TEXT_737);
     stringBuffer.append(genFeature.getAccessorName());
-    stringBuffer.append(TEXT_734);
+    stringBuffer.append(TEXT_738);
     } else if (genFeature.isBidirectional() || genFeature.isEffectiveContains()) {
     if (genModel.isVirtualDelegation()) {
-    stringBuffer.append(TEXT_735);
-    stringBuffer.append(genFeature.getImportedType());
-    stringBuffer.append(TEXT_736);
-    stringBuffer.append(genFeature.getSafeName());
-    stringBuffer.append(TEXT_737);
-    stringBuffer.append(genFeature.getImportedType());
-    stringBuffer.append(TEXT_738);
-    stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_739);
-    }
+    stringBuffer.append(genFeature.getImportedType());
     stringBuffer.append(TEXT_740);
     stringBuffer.append(genFeature.getSafeName());
     stringBuffer.append(TEXT_741);
-    if (!genFeature.isBidirectional()) {
+    stringBuffer.append(genFeature.getImportedType());
     stringBuffer.append(TEXT_742);
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
+    stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_743);
-    stringBuffer.append(genFeature.getSafeName());
+    }
     stringBuffer.append(TEXT_744);
-    stringBuffer.append(genFeature.getUpperName());
+    stringBuffer.append(genFeature.getSafeName());
     stringBuffer.append(TEXT_745);
-    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();
+    if (!genFeature.isBidirectional()) {
     stringBuffer.append(TEXT_746);
-    stringBuffer.append(genModel.getImportedName("org.eclipse.emf.ecore.InternalEObject"));
-    stringBuffer.append(TEXT_747);
     stringBuffer.append(genFeature.getSafeName());
+    stringBuffer.append(TEXT_747);
+    stringBuffer.append(genFeature.getUpperName());
     stringBuffer.append(TEXT_748);
-    stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
+    } else { GenFeature reverseFeature = genFeature.getReverse(); GenClass targetClass = reverseFeature.getGenClass();
     stringBuffer.append(TEXT_749);
-    stringBuffer.append(targetClass.getImportedInterfaceName());
+    stringBuffer.append(genFeature.getSafeName());
     stringBuffer.append(TEXT_750);
-    }
+    stringBuffer.append(targetClass.getQualifiedFeatureID(reverseFeature));
     stringBuffer.append(TEXT_751);
-    stringBuffer.append(genFeature.getAccessorName());
+    stringBuffer.append(targetClass.getImportedInterfaceName());
     stringBuffer.append(TEXT_752);
-    if (genModel.isVirtualDelegation()) {
+    }
     stringBuffer.append(TEXT_753);
-    stringBuffer.append(genFeature.getCapName());
+    stringBuffer.append(genFeature.getAccessorName());
     stringBuffer.append(TEXT_754);
-    stringBuffer.append(genFeature.getUpperName());
+    if (genModel.isVirtualDelegation()) {
     stringBuffer.append(TEXT_755);
+    stringBuffer.append(genFeature.getCapName());
+    stringBuffer.append(TEXT_756);
+    stringBuffer.append(genFeature.getUpperName());
+    stringBuffer.append(TEXT_757);
     } else if (genClass.isESetFlag(genFeature)) {
     if (!genModel.isSuppressNotification()) {
-    stringBuffer.append(TEXT_756);
+    stringBuffer.append(TEXT_758);
     stringBuffer.append(genFeature.getCapName());
-    stringBuffer.append(TEXT_757);
+    stringBuffer.append(TEXT_759);
     stringBuffer.append(genClass.getESetFlagsField(genFeature));
-    stringBuffer.append(TEXT_758);
+    stringBuffer.append(TEXT_760);
     stringBuffer.append(genFeature.getUpperName());
-    stringBuffer.append(TEXT_759);
+    stringBuffer.append(TEXT_761);
     }
-    stringBuffer.append(TEXT_760);
+    stringBuffer.append(TEXT_762);
     stringBuffer.append(genClass.getESetFlagsField(genFeature));
-    stringBuffer.append(TEXT_761);
+    stringBuffer.append(TEXT_763);
     stringBuffer.append(genFeature.getUpperName());
-    stringBuffer.append(TEXT_762);
+    stringBuffer.append(TEXT_764);
     } else {
     if (!genModel.isSuppressNotification()) {
-    stringBuffer.append(TEXT_763);
-    stringBuffer.append(genFeature.getCapName());

[... 1581 lines stripped ...]


---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org